Skip to content

Commit f5e3e50

Browse files
author
Jiri Kosina
committed
Merge branch 'for-6.5/i2c-hid' into for-linus
2 parents 278cc2f + e4b8807 commit f5e3e50

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

drivers/hid/i2c-hid/i2c-hid-acpi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ static struct i2c_driver i2c_hid_acpi_driver = {
118118
.acpi_match_table = i2c_hid_acpi_match,
119119
},
120120

121-
.probe_new = i2c_hid_acpi_probe,
121+
.probe = i2c_hid_acpi_probe,
122122
.remove = i2c_hid_core_remove,
123123
.shutdown = i2c_hid_core_shutdown,
124124
};

drivers/hid/i2c-hid/i2c-hid-of-elan.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ static struct i2c_driver elan_i2c_hid_ts_driver = {
118118
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
119119
.of_match_table = of_match_ptr(elan_i2c_hid_of_match),
120120
},
121-
.probe_new = i2c_hid_of_elan_probe,
121+
.probe = i2c_hid_of_elan_probe,
122122
.remove = i2c_hid_core_remove,
123123
.shutdown = i2c_hid_core_shutdown,
124124
};

drivers/hid/i2c-hid/i2c-hid-of-goodix.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ static struct i2c_driver goodix_i2c_hid_ts_driver = {
128128
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
129129
.of_match_table = of_match_ptr(goodix_i2c_hid_of_match),
130130
},
131-
.probe_new = i2c_hid_of_goodix_probe,
131+
.probe = i2c_hid_of_goodix_probe,
132132
.remove = i2c_hid_core_remove,
133133
.shutdown = i2c_hid_core_shutdown,
134134
};

drivers/hid/i2c-hid/i2c-hid-of.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ static struct i2c_driver i2c_hid_of_driver = {
157157
.of_match_table = of_match_ptr(i2c_hid_of_match),
158158
},
159159

160-
.probe_new = i2c_hid_of_probe,
160+
.probe = i2c_hid_of_probe,
161161
.remove = i2c_hid_core_remove,
162162
.shutdown = i2c_hid_core_shutdown,
163163
.id_table = i2c_hid_of_id_table,

0 commit comments

Comments
 (0)