net: Drop explicit initialization of struct i2c_device_id::driver_data to 0

These drivers don't use the driver_data member of struct i2c_device_id,
so don't explicitly initialize this member.

This prepares putting driver_data in an anonymous union which requires
either no initialization or named designators. But it's also a nice
cleanup on its own.

While add it, also remove commas after the sentinel entries.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Reviewed-by: Petr Machata <petrm@nvidia.com> # For mlxsw
Reviewed-by: Kory Maincent <Kory.maincent@bootlin.com>
Reviewed-by: Jeremy Kerr <jk@codeconstruct.com.au> # for mctp-i2c
Reviewed-by: Oleksij Rempel <o.rempel@pengutronix.de>
Acked-by: Oleksij Rempel <o.rempel@pengutronix.de>
Link: https://patch.msgid.link/20240625083853.2205977-2-u.kleine-koenig@baylibre.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/dsa/lan9303_i2c.c b/drivers/net/dsa/lan9303_i2c.c
index bbbec322bc4fbbc52ef5e66c5a862fb349000afb..c62d27cdc117db0219e5ad0677183b423e73c6e9 100644 (file)
--- a/drivers/net/dsa/lan9303_i2c.c
+++ b/drivers/net/dsa/lan9303_i2c.c
@@ -89,7 +89,7 @@ static void lan9303_i2c_shutdown(struct i2c_client *client)
 /*-------------------------------------------------------------------------*/
 
 static const struct i2c_device_id lan9303_i2c_id[] = {
-       { "lan9303", 0 },
+       { "lan9303" },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(i2c, lan9303_i2c_id);

diff --git a/drivers/net/dsa/microchip/ksz9477_i2c.c b/drivers/net/dsa/microchip/ksz9477_i2c.c
index 82bebee4615c1e6a1b57a27222868f8b769df25d..7d7560f23a73b5868cbd0ce10000ba5e1410fbcb 100644 (file)
--- a/drivers/net/dsa/microchip/ksz9477_i2c.c
+++ b/drivers/net/dsa/microchip/ksz9477_i2c.c
@@ -72,8 +72,8 @@ static void ksz9477_i2c_shutdown(struct i2c_client *i2c)
 }
 
 static const struct i2c_device_id ksz9477_i2c_id[] = {
-       { "ksz9477-switch", 0 },
-       {},
+       { "ksz9477-switch" },
+       {}
 };
 
 MODULE_DEVICE_TABLE(i2c, ksz9477_i2c_id);

diff --git a/drivers/net/dsa/xrs700x/xrs700x_i2c.c b/drivers/net/dsa/xrs700x/xrs700x_i2c.c
index c1179d7311f7e4f48e897dd338279eed031932ed..9b731dea78c14989dfae818dd7953d5d1ff06c57 100644 (file)
--- a/drivers/net/dsa/xrs700x/xrs700x_i2c.c
+++ b/drivers/net/dsa/xrs700x/xrs700x_i2c.c
@@ -127,8 +127,8 @@ static void xrs700x_i2c_shutdown(struct i2c_client *i2c)
 }
 
 static const struct i2c_device_id xrs700x_i2c_id[] = {
-       { "xrs700x-switch", 0 },
-       {},
+       { "xrs700x-switch" },
+       {}
 };
 
 MODULE_DEVICE_TABLE(i2c, xrs700x_i2c_id);

diff --git a/drivers/net/ethernet/mellanox/mlxsw/minimal.c b/drivers/net/ethernet/mellanox/mlxsw/minimal.c
index f0ceb196a6cea6a12ce5e5329b7b83a716e4d8f1..431accdc62132aee1351d6485df9fb918dbe9f02 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/minimal.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/minimal.c
@@ -702,8 +702,8 @@ static struct mlxsw_driver mlxsw_m_driver = {
 };
 
 static const struct i2c_device_id mlxsw_m_i2c_id[] = {
-       { "mlxsw_minimal", 0},
-       { },
+       { "mlxsw_minimal" },
+       { }
 };
 
 static struct i2c_driver mlxsw_m_i2c_driver = {

diff --git a/drivers/net/mctp/mctp-i2c.c b/drivers/net/mctp/mctp-i2c.c
index b37a9e4bade4a00254f07241861dcf716283646a..f9afea25044f00195854865cc75ab804aaf9e800 100644 (file)
--- a/drivers/net/mctp/mctp-i2c.c
+++ b/drivers/net/mctp/mctp-i2c.c
@@ -1042,8 +1042,8 @@ static struct notifier_block mctp_i2c_notifier = {
 };
 
 static const struct i2c_device_id mctp_i2c_id[] = {
-       { "mctp-i2c-interface", 0 },
-       {},
+       { "mctp-i2c-interface" },
+       {}
 };
 MODULE_DEVICE_TABLE(i2c, mctp_i2c_id);
 

diff --git a/drivers/net/pse-pd/pd692x0.c b/drivers/net/pse-pd/pd692x0.c
index 6488b941703c7b5c2ff78bb04d5f84bd75501844..820358b71f0f6d9a1a7c2171551878ad3a82b7a9 100644 (file)
--- a/drivers/net/pse-pd/pd692x0.c
+++ b/drivers/net/pse-pd/pd692x0.c
@@ -1194,8 +1194,8 @@ static void pd692x0_i2c_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id pd692x0_id[] = {
-       { PD692X0_PSE_NAME, 0 },
-       { },
+       { PD692X0_PSE_NAME },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, pd692x0_id);
 

diff --git a/drivers/net/pse-pd/tps23881.c b/drivers/net/pse-pd/tps23881.c
index 98ffbb1bbf13c7cbbdbeb8180366bc16ffe73a90..61f6ad9c1934e1dc17447886728492aa1a1f509e 100644 (file)
--- a/drivers/net/pse-pd/tps23881.c
+++ b/drivers/net/pse-pd/tps23881.c
@@ -794,8 +794,8 @@ static int tps23881_i2c_probe(struct i2c_client *client)
 }
 
 static const struct i2c_device_id tps23881_id[] = {
-       { "tps23881", 0 },
-       { },
+       { "tps23881" },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, tps23881_id);