Commit f5e3e50b authored by Jiri Kosina's avatar Jiri Kosina

Merge branch 'for-6.5/i2c-hid' into for-linus

parents 278cc2f1 e4b88075
...@@ -118,7 +118,7 @@ static struct i2c_driver i2c_hid_acpi_driver = { ...@@ -118,7 +118,7 @@ static struct i2c_driver i2c_hid_acpi_driver = {
.acpi_match_table = i2c_hid_acpi_match, .acpi_match_table = i2c_hid_acpi_match,
}, },
.probe_new = i2c_hid_acpi_probe, .probe = i2c_hid_acpi_probe,
.remove = i2c_hid_core_remove, .remove = i2c_hid_core_remove,
.shutdown = i2c_hid_core_shutdown, .shutdown = i2c_hid_core_shutdown,
}; };
......
...@@ -118,7 +118,7 @@ static struct i2c_driver elan_i2c_hid_ts_driver = { ...@@ -118,7 +118,7 @@ static struct i2c_driver elan_i2c_hid_ts_driver = {
.probe_type = PROBE_PREFER_ASYNCHRONOUS, .probe_type = PROBE_PREFER_ASYNCHRONOUS,
.of_match_table = of_match_ptr(elan_i2c_hid_of_match), .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, .remove = i2c_hid_core_remove,
.shutdown = i2c_hid_core_shutdown, .shutdown = i2c_hid_core_shutdown,
}; };
......
...@@ -128,7 +128,7 @@ static struct i2c_driver goodix_i2c_hid_ts_driver = { ...@@ -128,7 +128,7 @@ static struct i2c_driver goodix_i2c_hid_ts_driver = {
.probe_type = PROBE_PREFER_ASYNCHRONOUS, .probe_type = PROBE_PREFER_ASYNCHRONOUS,
.of_match_table = of_match_ptr(goodix_i2c_hid_of_match), .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, .remove = i2c_hid_core_remove,
.shutdown = i2c_hid_core_shutdown, .shutdown = i2c_hid_core_shutdown,
}; };
......
...@@ -157,7 +157,7 @@ static struct i2c_driver i2c_hid_of_driver = { ...@@ -157,7 +157,7 @@ static struct i2c_driver i2c_hid_of_driver = {
.of_match_table = of_match_ptr(i2c_hid_of_match), .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, .remove = i2c_hid_core_remove,
.shutdown = i2c_hid_core_shutdown, .shutdown = i2c_hid_core_shutdown,
.id_table = i2c_hid_of_id_table, .id_table = i2c_hid_of_id_table,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment