Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
f5e3e50b
Commit
f5e3e50b
authored
Jun 27, 2023
by
Jiri Kosina
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-6.5/i2c-hid' into for-linus
parents
278cc2f1
e4b88075
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
drivers/hid/i2c-hid/i2c-hid-acpi.c
drivers/hid/i2c-hid/i2c-hid-acpi.c
+1
-1
drivers/hid/i2c-hid/i2c-hid-of-elan.c
drivers/hid/i2c-hid/i2c-hid-of-elan.c
+1
-1
drivers/hid/i2c-hid/i2c-hid-of-goodix.c
drivers/hid/i2c-hid/i2c-hid-of-goodix.c
+1
-1
drivers/hid/i2c-hid/i2c-hid-of.c
drivers/hid/i2c-hid/i2c-hid-of.c
+1
-1
No files found.
drivers/hid/i2c-hid/i2c-hid-acpi.c
View file @
f5e3e50b
...
...
@@ -118,7 +118,7 @@ static struct i2c_driver i2c_hid_acpi_driver = {
.
acpi_match_table
=
i2c_hid_acpi_match
,
},
.
probe
_new
=
i2c_hid_acpi_probe
,
.
probe
=
i2c_hid_acpi_probe
,
.
remove
=
i2c_hid_core_remove
,
.
shutdown
=
i2c_hid_core_shutdown
,
};
...
...
drivers/hid/i2c-hid/i2c-hid-of-elan.c
View file @
f5e3e50b
...
...
@@ -118,7 +118,7 @@ static struct i2c_driver elan_i2c_hid_ts_driver = {
.
probe_type
=
PROBE_PREFER_ASYNCHRONOUS
,
.
of_match_table
=
of_match_ptr
(
elan_i2c_hid_of_match
),
},
.
probe
_new
=
i2c_hid_of_elan_probe
,
.
probe
=
i2c_hid_of_elan_probe
,
.
remove
=
i2c_hid_core_remove
,
.
shutdown
=
i2c_hid_core_shutdown
,
};
...
...
drivers/hid/i2c-hid/i2c-hid-of-goodix.c
View file @
f5e3e50b
...
...
@@ -128,7 +128,7 @@ static struct i2c_driver goodix_i2c_hid_ts_driver = {
.
probe_type
=
PROBE_PREFER_ASYNCHRONOUS
,
.
of_match_table
=
of_match_ptr
(
goodix_i2c_hid_of_match
),
},
.
probe
_new
=
i2c_hid_of_goodix_probe
,
.
probe
=
i2c_hid_of_goodix_probe
,
.
remove
=
i2c_hid_core_remove
,
.
shutdown
=
i2c_hid_core_shutdown
,
};
...
...
drivers/hid/i2c-hid/i2c-hid-of.c
View file @
f5e3e50b
...
...
@@ -157,7 +157,7 @@ static struct i2c_driver i2c_hid_of_driver = {
.
of_match_table
=
of_match_ptr
(
i2c_hid_of_match
),
},
.
probe
_new
=
i2c_hid_of_probe
,
.
probe
=
i2c_hid_of_probe
,
.
remove
=
i2c_hid_core_remove
,
.
shutdown
=
i2c_hid_core_shutdown
,
.
id_table
=
i2c_hid_of_id_table
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment