diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2023-06-27 22:42:28 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2023-06-27 22:42:28 +0200 |
| commit | f5e3e50b7df8c3dbb79a17eebc10da5f5133f2a6 (patch) | |
| tree | 8c9217ff3223c7510ba0ab40728c624fb6e83407 | |
| parent | 278cc2f13d8031e23b04744de739310257eaf6b2 (diff) | |
| parent | e4b880758a9182fbfa4b28302a66acfeac2cbfed (diff) | |
| download | livepatching-f5e3e50b7df8c3dbb79a17eebc10da5f5133f2a6.tar.gz | |
Merge branch 'for-6.5/i2c-hid' into for-linus
| -rw-r--r-- | drivers/hid/i2c-hid/i2c-hid-acpi.c | 2 | ||||
| -rw-r--r-- | drivers/hid/i2c-hid/i2c-hid-of-elan.c | 2 | ||||
| -rw-r--r-- | drivers/hid/i2c-hid/i2c-hid-of-goodix.c | 2 | ||||
| -rw-r--r-- | drivers/hid/i2c-hid/i2c-hid-of.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hid/i2c-hid/i2c-hid-acpi.c b/drivers/hid/i2c-hid/i2c-hid-acpi.c index 3a7e2bcb541204..ac918a9ea8d344 100644 --- a/drivers/hid/i2c-hid/i2c-hid-acpi.c +++ b/drivers/hid/i2c-hid/i2c-hid-acpi.c @@ -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, }; diff --git a/drivers/hid/i2c-hid/i2c-hid-of-elan.c b/drivers/hid/i2c-hid/i2c-hid-of-elan.c index 76ddc8be1cbbc6..029045d9661c6e 100644 --- a/drivers/hid/i2c-hid/i2c-hid-of-elan.c +++ b/drivers/hid/i2c-hid/i2c-hid-of-elan.c @@ -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, }; diff --git a/drivers/hid/i2c-hid/i2c-hid-of-goodix.c b/drivers/hid/i2c-hid/i2c-hid-of-goodix.c index db4639db984079..f1597ad67e7c8a 100644 --- a/drivers/hid/i2c-hid/i2c-hid-of-goodix.c +++ b/drivers/hid/i2c-hid/i2c-hid-of-goodix.c @@ -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, }; diff --git a/drivers/hid/i2c-hid/i2c-hid-of.c b/drivers/hid/i2c-hid/i2c-hid-of.c index 855f53092f4e37..c4e1fa0273c84c 100644 --- a/drivers/hid/i2c-hid/i2c-hid-of.c +++ b/drivers/hid/i2c-hid/i2c-hid-of.c @@ -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, |