[PATCH v3 20/23] mfd: Unify style of i2c_device_id arrays
Uwe Kleine-König (The Capable Hub) <[email protected]> Thu, 9 Jul 2026 18:58:39 +0200
| Newsgroups | org.kernel.vger.linux-omap,dev.linux.lists.mfd,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <a2a2ece7d82cfe644c5c588f84379917790dc923.1783615311.git.u.kleine-koenig@baylibre.com> |
Most of these arrays already mostly match the most used and
generally recommended coding style. That is:
- no comma after the list terminator;
- a comma after an initializer if (and only if) the closing } is not
directly following;
- no explicit zeros in the list terminator;
- a space after an opening { and before a closing }, a single space in
the list terminator;
Adapt the few offenders accordingly and also use tabs for indention for
two drivers.
Reviewed-by: Charles Keepax <[email protected]>
Signed-off-by: Uwe Kleine-König (The Capable Hub) <[email protected]>
---
drivers/mfd/88pm800.c | 2 +-
drivers/mfd/88pm805.c | 2 +-
drivers/mfd/88pm860x-core.c | 2 +-
drivers/mfd/act8945a.c | 2 +-
drivers/mfd/as3711.c | 2 +-
drivers/mfd/as3722.c | 2 +-
drivers/mfd/bq257xx.c | 2 +-
drivers/mfd/cs40l50-i2c.c | 2 +-
drivers/mfd/da903x.c | 2 +-
drivers/mfd/da9052-i2c.c | 2 +-
drivers/mfd/da9063-i2c.c | 2 +-
drivers/mfd/max77620.c | 2 +-
drivers/mfd/max77843.c | 2 +-
drivers/mfd/max8907.c | 2 +-
drivers/mfd/rc5t583.c | 2 +-
drivers/mfd/rsmu_i2c.c | 2 +-
drivers/mfd/si476x-i2c.c | 2 +-
drivers/mfd/tps65910.c | 6 +++---
drivers/mfd/wm8400-core.c | 4 ++--
19 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c
index 74dc419402f9..fe1017c6234b 100644
--- a/drivers/mfd/88pm800.c
+++ b/drivers/mfd/88pm800.c
@@ -117,7 +117,7 @@ enum {
static const struct i2c_device_id pm80x_id_table[] = {
{ .name = "88PM800" },
- {} /* NULL terminated */
+ { } /* NULL terminated */
};
MODULE_DEVICE_TABLE(i2c, pm80x_id_table);
diff --git a/drivers/mfd/88pm805.c b/drivers/mfd/88pm805.c
index 2eb3380a5207..8df11233bc4c 100644
--- a/drivers/mfd/88pm805.c
+++ b/drivers/mfd/88pm805.c
@@ -31,7 +31,7 @@
static const struct i2c_device_id pm80x_id_table[] = {
{ .name = "88PM805" },
- {} /* NULL terminated */
+ { } /* NULL terminated */
};
MODULE_DEVICE_TABLE(i2c, pm80x_id_table);
diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
index 1b201ad129c2..d3c24a7a3936 100644
--- a/drivers/mfd/88pm860x-core.c
+++ b/drivers/mfd/88pm860x-core.c
@@ -1233,7 +1233,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(pm860x_pm_ops, pm860x_suspend, pm860x_resume);
static const struct i2c_device_id pm860x_id_table[] = {
{ .name = "88PM860x" },
- {}
+ { }
};
MODULE_DEVICE_TABLE(i2c, pm860x_id_table);
diff --git a/drivers/mfd/act8945a.c b/drivers/mfd/act8945a.c
index bb1b4e4fb288..e5fba40f89d4 100644
--- a/drivers/mfd/act8945a.c
+++ b/drivers/mfd/act8945a.c
@@ -55,7 +55,7 @@ static int act8945a_i2c_probe(struct i2c_client *i2c)
static const struct i2c_device_id act8945a_i2c_id[] = {
{ .name = "act8945a" },
- {}
+ { }
};
MODULE_DEVICE_TABLE(i2c, act8945a_i2c_id);
diff --git a/drivers/mfd/as3711.c b/drivers/mfd/as3711.c
index eb03b813d58f..6d2fa63e7f4b 100644
--- a/drivers/mfd/as3711.c
+++ b/drivers/mfd/as3711.c
@@ -193,7 +193,7 @@ static int as3711_i2c_probe(struct i2c_client *client)
static const struct i2c_device_id as3711_i2c_id[] = {
{ .name = "as3711" },
- {}
+ { }
};
static struct i2c_driver as3711_i2c_driver = {
diff --git a/drivers/mfd/as3722.c b/drivers/mfd/as3722.c
index 2f58709ffd9a..ec7be5fb326e 100644
--- a/drivers/mfd/as3722.c
+++ b/drivers/mfd/as3722.c
@@ -433,7 +433,7 @@ MODULE_DEVICE_TABLE(of, as3722_of_match);
static const struct i2c_device_id as3722_i2c_id[] = {
{ .name = "as3722" },
- {}
+ { }
};
MODULE_DEVICE_TABLE(i2c, as3722_i2c_id);
diff --git a/drivers/mfd/bq257xx.c b/drivers/mfd/bq257xx.c
index 8ad9f0ad6512..182d67f23f60 100644
--- a/drivers/mfd/bq257xx.c
+++ b/drivers/mfd/bq257xx.c
@@ -121,7 +121,7 @@ static int bq257xx_probe(struct i2c_client *client)
static const struct i2c_device_id bq257xx_i2c_ids[] = {
{ .name = "bq25703a", .driver_data = BQ25703A },
{ .name = "bq25792", .driver_data = BQ25792 },
- {}
+ { }
};
MODULE_DEVICE_TABLE(i2c, bq257xx_i2c_ids);
diff --git a/drivers/mfd/cs40l50-i2c.c b/drivers/mfd/cs40l50-i2c.c
index 6043eb6639b5..b61b0484644d 100644
--- a/drivers/mfd/cs40l50-i2c.c
+++ b/drivers/mfd/cs40l50-i2c.c
@@ -41,7 +41,7 @@ static void cs40l50_i2c_remove(struct i2c_client *i2c)
static const struct i2c_device_id cs40l50_id_i2c[] = {
{ .name = "cs40l50" },
- {}
+ { }
};
MODULE_DEVICE_TABLE(i2c, cs40l50_id_i2c);
diff --git a/drivers/mfd/da903x.c b/drivers/mfd/da903x.c
index c949ebc57b18..46d9d823414a 100644
--- a/drivers/mfd/da903x.c
+++ b/drivers/mfd/da903x.c
@@ -441,7 +441,7 @@ static const struct da903x_chip_ops da903x_ops[] = {
static const struct i2c_device_id da903x_id_table[] = {
{ .name = "da9030", .driver_data = 0 },
{ .name = "da9034", .driver_data = 1 },
- { },
+ { }
};
MODULE_DEVICE_TABLE(i2c, da903x_id_table);
diff --git a/drivers/mfd/da9052-i2c.c b/drivers/mfd/da9052-i2c.c
index b75cfe805d5e..6af9552ccba1 100644
--- a/drivers/mfd/da9052-i2c.c
+++ b/drivers/mfd/da9052-i2c.c
@@ -108,7 +108,7 @@ static const struct i2c_device_id da9052_i2c_id[] = {
{ .name = "da9053-ba", .driver_data = DA9053_BA },
{ .name = "da9053-bb", .driver_data = DA9053_BB },
{ .name = "da9053-bc", .driver_data = DA9053_BC },
- {}
+ { }
};
MODULE_DEVICE_TABLE(i2c, da9052_i2c_id);
diff --git a/drivers/mfd/da9063-i2c.c b/drivers/mfd/da9063-i2c.c
index b57a6ee90aa9..068f080d1f9b 100644
--- a/drivers/mfd/da9063-i2c.c
+++ b/drivers/mfd/da9063-i2c.c
@@ -478,7 +478,7 @@ static int da9063_i2c_probe(struct i2c_client *i2c)
static const struct i2c_device_id da9063_i2c_id[] = {
{ .name = "da9063", .driver_data = PMIC_TYPE_DA9063 },
{ .name = "da9063l", .driver_data = PMIC_TYPE_DA9063L },
- {},
+ { }
};
MODULE_DEVICE_TABLE(i2c, da9063_i2c_id);
diff --git a/drivers/mfd/max77620.c b/drivers/mfd/max77620.c
index a66ca73997f5..e4d7cb4afef0 100644
--- a/drivers/mfd/max77620.c
+++ b/drivers/mfd/max77620.c
@@ -697,7 +697,7 @@ static const struct i2c_device_id max77620_id[] = {
{ .name = "max77620", .driver_data = MAX77620 },
{ .name = "max20024", .driver_data = MAX20024 },
{ .name = "max77663", .driver_data = MAX77663 },
- {},
+ { }
};
static DEFINE_SIMPLE_DEV_PM_OPS(max77620_pm_ops,
diff --git a/drivers/mfd/max77843.c b/drivers/mfd/max77843.c
index 9e535ff1e3f7..c1cbf1f88b15 100644
--- a/drivers/mfd/max77843.c
+++ b/drivers/mfd/max77843.c
@@ -170,7 +170,7 @@ static const struct of_device_id max77843_dt_match[] = {
static const struct i2c_device_id max77843_id[] = {
{ .name = "max77843", .driver_data = TYPE_MAX77843 },
- { },
+ { }
};
static int __maybe_unused max77843_suspend(struct device *dev)
diff --git a/drivers/mfd/max8907.c b/drivers/mfd/max8907.c
index 70ffc08a96d1..6e2fed7021a8 100644
--- a/drivers/mfd/max8907.c
+++ b/drivers/mfd/max8907.c
@@ -301,7 +301,7 @@ MODULE_DEVICE_TABLE(of, max8907_of_match);
static const struct i2c_device_id max8907_i2c_id[] = {
{ .name = "max8907" },
- {}
+ { }
};
MODULE_DEVICE_TABLE(i2c, max8907_i2c_id);
diff --git a/drivers/mfd/rc5t583.c b/drivers/mfd/rc5t583.c
index 4ad761fbfab2..acb42868be37 100644
--- a/drivers/mfd/rc5t583.c
+++ b/drivers/mfd/rc5t583.c
@@ -281,7 +281,7 @@ static int rc5t583_i2c_probe(struct i2c_client *i2c)
static const struct i2c_device_id rc5t583_i2c_id[] = {
{ .name = "rc5t583" },
- {}
+ { }
};
static struct i2c_driver rc5t583_i2c_driver = {
diff --git a/drivers/mfd/rsmu_i2c.c b/drivers/mfd/rsmu_i2c.c
index d05aaf576a86..c03db3ce5f12 100644
--- a/drivers/mfd/rsmu_i2c.c
+++ b/drivers/mfd/rsmu_i2c.c
@@ -335,7 +335,7 @@ static const struct i2c_device_id rsmu_i2c_id[] = {
{ .name = "82p33811", .driver_data = RSMU_SABRE },
{ .name = "8v19n850", .driver_data = RSMU_SL },
{ .name = "8v19n851", .driver_data = RSMU_SL },
- {}
+ { }
};
MODULE_DEVICE_TABLE(i2c, rsmu_i2c_id);
diff --git a/drivers/mfd/si476x-i2c.c b/drivers/mfd/si476x-i2c.c
index f25a4b60071b..30e545cd0889 100644
--- a/drivers/mfd/si476x-i2c.c
+++ b/drivers/mfd/si476x-i2c.c
@@ -844,7 +844,7 @@ static const struct i2c_device_id si476x_id[] = {
{ .name = "si4761", .driver_data = SI476X_CHIP_SI4761 },
{ .name = "si4764", .driver_data = SI476X_CHIP_SI4764 },
{ .name = "si4768", .driver_data = SI476X_CHIP_SI4768 },
- { },
+ { }
};
MODULE_DEVICE_TABLE(i2c, si476x_id);
diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
index b0dbee3e6ea2..d19bd3643591 100644
--- a/drivers/mfd/tps65910.c
+++ b/drivers/mfd/tps65910.c
@@ -532,9 +532,9 @@ static int tps65910_i2c_probe(struct i2c_client *i2c)
}
static const struct i2c_device_id tps65910_i2c_id[] = {
- { .name = "tps65910", .driver_data = TPS65910 },
- { .name = "tps65911", .driver_data = TPS65911 },
- { }
+ { .name = "tps65910", .driver_data = TPS65910 },
+ { .name = "tps65911", .driver_data = TPS65911 },
+ { }
};
static struct i2c_driver tps65910_i2c_driver = {
diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c
index 1c0ba450ef9b..d3180aa44e1a 100644
--- a/drivers/mfd/wm8400-core.c
+++ b/drivers/mfd/wm8400-core.c
@@ -135,8 +135,8 @@ static int wm8400_i2c_probe(struct i2c_client *i2c)
}
static const struct i2c_device_id wm8400_i2c_id[] = {
- { .name = "wm8400" },
- { }
+ { .name = "wm8400" },
+ { }
};
static struct i2c_driver wm8400_i2c_driver = {
--
2.55.0.11.g153666a7d9bb