drivers/i2c: use simple i2c probe
Subsystems (3)
PATCH 1/1 drivers/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
)
, };
--- drivers/i2c/i2c-core-base.c | 5 ++--- drivers/i2c/i2c-smbus.c | 5 ++--- drivers/i2c/muxes/i2c-mux-pca9541.c | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-)
drivers/i2c/i2c-core-base.c +2 -3
@@ -1013,15 +1013,14 @@ static const struct i2c_device_id dummy_id[] = { { }, }; -static int dummy_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int dummy_probe (struct i2c_client *client) {return 0 ; }static struct i2c_driver dummy_driver = { .driver.name ="dummy" , - .probe = dummy_probe, + .probe_new = dummy_probe, .id_table = dummy_id, };
drivers/i2c/i2c-smbus.c +2 -3
@@ -112,8 +112,7 @@ static void smbalert_work(struct work_struct *work) }/* Setup SMBALERT# infrastructure */ -static int smbalert_probe (struct i2c_client *ara, -const struct i2c_device_id *id) +static int smbalert_probe (struct i2c_client *ara) {struct i2c_smbus_alert_setup *setup =dev_get_platdata (&ara->dev);struct i2c_smbus_alert *alert;
@@ -170,7 +169,7 @@ static struct i2c_driver smbalert_driver = { .driver = { .name = "smbus_alert", }, - .probe = smbalert_probe, + .probe_new = smbalert_probe, .remove = smbalert_remove, .id_table = smbalert_ids, };
drivers/i2c/muxes/i2c-mux-pca9541.c +2 -3
@@ -283,8 +283,7 @@ static int pca9541_release_chan(struct i2c_mux_core *muxc, u32 chan)/* * I2C init/probing/exit functions */ -static int pca9541_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int pca9541_probe (struct i2c_client *client) {struct i2c_adapter *adap = client->adapter;struct i2c_mux_core *muxc;
@@ -337,7 +336,7 @@ static struct i2c_driver pca9541_driver = { .name = "pca9541", .of_match_table = of_match_ptr(pca9541_of_match), }, - .probe = pca9541_probe, + .probe_new = pca9541_probe, .remove = pca9541_remove, .id_table = pca9541_id, };
base-commit: 833477fce7a14d43ae4c07f8ddc32fa5119471a2
Signature · 1 line
2.30.2
Quoted 54 lines · Stephen Kitt
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:
indrivers/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_newinstead, avoiding the call toi2c_match_id. Drivers which do can still be converted to probe_new-style, callingi2c_match_idthemselves (as is done currently forof_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 intfn(struct i2c_client *client)
{
...when != id
}@ rule2 depends on rule1 @
identifier rule1.fn;
identifier driver;
@@struct
i2c_driverdriver = {(quoted diff) +1
-1- .probe + .probe_new =(
fn
|(quoted diff) +1
-1- &fn + fn)
Quoted 4 lines
, };Signed-off-by Stephen Kitt <[email protected]>
Dropped the mux-part because I applied an older patch doing the same. Despite that, applied the rest to for-next, thanks!