drivers/net/dsa: use simple i2c probe
Subsystems (5)
PATCH 1/1 drivers/net/dsa: 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/net/dsa/lan9303_i2c.c | 5 ++--- drivers/net/dsa/microchip/ksz9477_i2c.c | 5 ++--- drivers/net/dsa/xrs700x/xrs700x_i2c.c | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-)
drivers/net/dsa/lan9303_i2c.c +2 -3
@@ -29,8 +29,7 @@ static const struct regmap_config lan9303_i2c_regmap_config = { .cache_type = REGCACHE_NONE, }; -static int lan9303_i2c_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static int lan9303_i2c_probe (struct i2c_client *client) {struct lan9303_i2c *sw_dev;int ret;
@@ -106,7 +105,7 @@ static struct i2c_driver lan9303_i2c_driver = { .name = "LAN9303_I2C", .of_match_table = of_match_ptr(lan9303_i2c_of_match), }, - .probe = lan9303_i2c_probe, + .probe_new = lan9303_i2c_probe, .remove = lan9303_i2c_remove, .shutdown = lan9303_i2c_shutdown, .id_table = lan9303_i2c_id,
drivers/net/dsa/microchip/ksz9477_i2c.c +2 -3
@@ -14,8 +14,7 @@KSZ_REGMAP_TABLE (ksz9477, not_used,16 ,0 ,0 ); -static int ksz9477_i2c_probe (struct i2c_client *i2c, -const struct i2c_device_id *i2c_id) +static int ksz9477_i2c_probe (struct i2c_client *i2c) {struct regmap_config rc;struct ksz_device *dev;
@@ -120,7 +119,7 @@ static struct i2c_driver ksz9477_i2c_driver = { .name = "ksz9477-switch", .of_match_table = of_match_ptr(ksz9477_dt_ids), }, - .probe = ksz9477_i2c_probe, + .probe_new = ksz9477_i2c_probe, .remove = ksz9477_i2c_remove, .shutdown = ksz9477_i2c_shutdown, .id_table = ksz9477_i2c_id,
drivers/net/dsa/xrs700x/xrs700x_i2c.c +2 -3
@@ -76,8 +76,7 @@ static const struct regmap_config xrs700x_i2c_regmap_config = { .val_format_endian = REGMAP_ENDIAN_BIG }; -static int xrs700x_i2c_probe (struct i2c_client *i2c, -const struct i2c_device_id *i2c_id) +static int xrs700x_i2c_probe (struct i2c_client *i2c) {struct xrs700x *priv;int ret;
@@ -148,7 +147,7 @@ static struct i2c_driver xrs700x_i2c_driver = { .name = "xrs700x-i2c", .of_match_table = of_match_ptr(xrs700x_i2c_dt_ids), }, - .probe = xrs700x_i2c_probe, + .probe_new = xrs700x_i2c_probe, .remove = xrs700x_i2c_remove, .shutdown = xrs700x_i2c_shutdown, .id_table = xrs700x_i2c_id,
base-commit: 833477fce7a14d43ae4c07f8ddc32fa5119471a2
Signature · 1 line
2.30.2
Jakub Kicinski
maintainerQuoted 3 lines · On Wed, 12 Oct 2022 19:55:06 +0200 Stephen Kitt wrote:
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.
Hold these off until after the merge window, please, net-next is closed until rc1 is cut.