mirror of
https://github.com/torvalds/linux.git
synced 2026-05-30 01:53:29 +02:00
HID: i2c: use simple i2c probe
All these drivers have an i2c probe function which doesn't use the
"struct i2c_device_id *id" parameter, so they can trivially be
converted to the "probe_new" style of probe with a single argument.
This is part of an ongoing transition to single-argument i2c probe
functions. Old-style probe functions involve a call to i2c_match_id:
in drivers/i2c/i2c-core-base.c,
/*
* When there are no more users of probe(),
* rename probe_new to probe.
*/
if (driver->probe_new)
status = driver->probe_new(client);
else if (driver->probe)
status = driver->probe(client,
i2c_match_id(driver->id_table, client));
else
status = -EINVAL;
Drivers which don't need the second parameter can be declared using
probe_new instead, avoiding the call to i2c_match_id. Drivers which do
can still be converted to probe_new-style, calling i2c_match_id
themselves (as is done currently for of_match_id).
This change was done using the following Coccinelle script, and fixed
up for whitespace changes:
@ rule1 @
identifier fn;
identifier client, id;
@@
- static int fn(struct i2c_client *client, const struct i2c_device_id *id)
+ static int fn(struct i2c_client *client)
{
...when != id
}
@ rule2 depends on rule1 @
identifier rule1.fn;
identifier driver;
@@
struct i2c_driver driver = {
- .probe
+ .probe_new
=
(
fn
|
- &fn
+ fn
)
,
};
Signed-off-by: Stephen Kitt <steve@sk2.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
parent
79d11de963
commit
baf34f3bbe
|
|
@ -68,8 +68,7 @@ static void elan_i2c_hid_power_down(struct i2chid_ops *ops)
|
|||
regulator_disable(ihid_elan->vcc33);
|
||||
}
|
||||
|
||||
static int i2c_hid_of_elan_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
static int i2c_hid_of_elan_probe(struct i2c_client *client)
|
||||
{
|
||||
struct i2c_hid_of_elan *ihid_elan;
|
||||
|
||||
|
|
@ -119,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 = i2c_hid_of_elan_probe,
|
||||
.probe_new = i2c_hid_of_elan_probe,
|
||||
.remove = i2c_hid_core_remove,
|
||||
.shutdown = i2c_hid_core_shutdown,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -87,8 +87,7 @@ static int ihid_goodix_vdd_notify(struct notifier_block *nb,
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int i2c_hid_of_goodix_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
static int i2c_hid_of_goodix_probe(struct i2c_client *client)
|
||||
{
|
||||
struct i2c_hid_of_goodix *ihid_goodix;
|
||||
int ret;
|
||||
|
|
@ -167,7 +166,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 = i2c_hid_of_goodix_probe,
|
||||
.probe_new = i2c_hid_of_goodix_probe,
|
||||
.remove = i2c_hid_core_remove,
|
||||
.shutdown = i2c_hid_core_shutdown,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -66,8 +66,7 @@ static void i2c_hid_of_power_down(struct i2chid_ops *ops)
|
|||
ihid_of->supplies);
|
||||
}
|
||||
|
||||
static int i2c_hid_of_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *dev_id)
|
||||
static int i2c_hid_of_probe(struct i2c_client *client)
|
||||
{
|
||||
struct device *dev = &client->dev;
|
||||
struct i2c_hid_of *ihid_of;
|
||||
|
|
@ -138,7 +137,7 @@ static struct i2c_driver i2c_hid_of_driver = {
|
|||
.of_match_table = of_match_ptr(i2c_hid_of_match),
|
||||
},
|
||||
|
||||
.probe = i2c_hid_of_probe,
|
||||
.probe_new = i2c_hid_of_probe,
|
||||
.remove = i2c_hid_core_remove,
|
||||
.shutdown = i2c_hid_core_shutdown,
|
||||
.id_table = i2c_hid_of_id_table,
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user