regulator: Use named initializers for platform_device_id arrays

Named initializers are better readable and more robust to changes of the
struct definition. This robustness is relevant for a planned change to
struct platform_device_id replacing .driver_data by an anonymous unit.

While touching these arrays unify spacing and usage of commas.

Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
Acked-by: Karel Balej <balejk@matfyz.cz>
Reviewed-by: Matti Vaittinen <mazziesaccount@gmail.com>
Link: https://patch.msgid.link/d02f55dfd5bdd743ae5cd76f2a5af0d346226a68.1779878004.git.u.kleine-koenig@baylibre.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/regulator/88pm886-regulator.c b/drivers/regulator/88pm886-regulator.c
index a38bd4f312b723e2b87fb1f82dbd3d808f9ed6d5..7328cd1cf2654c618430f4c6e47d7a16c8e69b18 100644 (file)
--- a/drivers/regulator/88pm886-regulator.c
+++ b/drivers/regulator/88pm886-regulator.c
@@ -373,7 +373,7 @@ static int pm886_regulator_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id pm886_regulator_id_table[] = {
-       { "88pm886-regulator", },
+       { .name = "88pm886-regulator" },
        { }
 };
 MODULE_DEVICE_TABLE(platform, pm886_regulator_id_table);

diff --git a/drivers/regulator/bd71815-regulator.c b/drivers/regulator/bd71815-regulator.c
index 668714f35464cedda5c0bfa4613b75ef70098b8d..4c2b20d1b2846a024b6534ec21c07544ad50c535 100644 (file)
--- a/drivers/regulator/bd71815-regulator.c
+++ b/drivers/regulator/bd71815-regulator.c
@@ -607,8 +607,8 @@ static int bd7181x_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id bd7181x_pmic_id[] = {
-       { "bd71815-pmic", ROHM_CHIP_TYPE_BD71815 },
-       { },
+       { .name = "bd71815-pmic", .driver_data = ROHM_CHIP_TYPE_BD71815 },
+       { }
 };
 MODULE_DEVICE_TABLE(platform, bd7181x_pmic_id);
 

diff --git a/drivers/regulator/bd71828-regulator.c b/drivers/regulator/bd71828-regulator.c
index 473beb4399d9db0ecd939bd55ba77f64cb1f0371..bd61caa8284a7dd0cd8e9730374f0728a244e60a 100644 (file)
--- a/drivers/regulator/bd71828-regulator.c
+++ b/drivers/regulator/bd71828-regulator.c
@@ -1691,9 +1691,9 @@ static int bd71828_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id bd71828_pmic_id[] = {
-       { "bd71828-pmic", ROHM_CHIP_TYPE_BD71828 },
-       { "bd72720-pmic", ROHM_CHIP_TYPE_BD72720 },
-       { },
+       { .name = "bd71828-pmic", .driver_data = ROHM_CHIP_TYPE_BD71828 },
+       { .name = "bd72720-pmic", .driver_data = ROHM_CHIP_TYPE_BD72720 },
+       { }
 };
 MODULE_DEVICE_TABLE(platform, bd71828_pmic_id);
 

diff --git a/drivers/regulator/bd718x7-regulator.c b/drivers/regulator/bd718x7-regulator.c
index 1b5997c8482e0f0890557e35a796bbcc310d10b7..9cc29b9409d03761692f9e1fc4467f0d3ad67057 100644 (file)
--- a/drivers/regulator/bd718x7-regulator.c
+++ b/drivers/regulator/bd718x7-regulator.c
@@ -1816,9 +1816,9 @@ static int bd718xx_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id bd718x7_pmic_id[] = {
-       { "bd71837-pmic", ROHM_CHIP_TYPE_BD71837 },
-       { "bd71847-pmic", ROHM_CHIP_TYPE_BD71847 },
-       { },
+       { .name = "bd71837-pmic", .driver_data = ROHM_CHIP_TYPE_BD71837 },
+       { .name = "bd71847-pmic", .driver_data = ROHM_CHIP_TYPE_BD71847 },
+       { }
 };
 MODULE_DEVICE_TABLE(platform, bd718x7_pmic_id);
 

diff --git a/drivers/regulator/bd9571mwv-regulator.c b/drivers/regulator/bd9571mwv-regulator.c
index f4de24a281b123984b6a67e28fd00ff16e5ac564..5bf02dc0d20e37d51b4454679b610f59d60819f6 100644 (file)
--- a/drivers/regulator/bd9571mwv-regulator.c
+++ b/drivers/regulator/bd9571mwv-regulator.c
@@ -344,8 +344,8 @@ static int bd9571mwv_regulator_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id bd9571mwv_regulator_id_table[] = {
-       { "bd9571mwv-regulator", ROHM_CHIP_TYPE_BD9571 },
-       { "bd9574mwf-regulator", ROHM_CHIP_TYPE_BD9574 },
+       { .name = "bd9571mwv-regulator", .driver_data = ROHM_CHIP_TYPE_BD9571 },
+       { .name = "bd9574mwf-regulator", .driver_data = ROHM_CHIP_TYPE_BD9574 },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(platform, bd9571mwv_regulator_id_table);

diff --git a/drivers/regulator/bd9576-regulator.c b/drivers/regulator/bd9576-regulator.c
index bf5f9c3f2c97529598126a4a848f4684b8f09a94..fcdaaa56e356e8382f37819bb864cbb579b1181b 100644 (file)
--- a/drivers/regulator/bd9576-regulator.c
+++ b/drivers/regulator/bd9576-regulator.c
@@ -1117,9 +1117,9 @@ static int bd957x_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id bd957x_pmic_id[] = {
-       { "bd9573-regulator", ROHM_CHIP_TYPE_BD9573 },
-       { "bd9576-regulator", ROHM_CHIP_TYPE_BD9576 },
-       { },
+       { .name = "bd9573-regulator", .driver_data = ROHM_CHIP_TYPE_BD9573 },
+       { .name = "bd9576-regulator", .driver_data = ROHM_CHIP_TYPE_BD9576 },
+       { }
 };
 MODULE_DEVICE_TABLE(platform, bd957x_pmic_id);
 

diff --git a/drivers/regulator/bd96801-regulator.c b/drivers/regulator/bd96801-regulator.c
index 129b20c33badcddeff04f361f4c9d677e7d3e9de..308279b31fd38be407c5addfca4dec2fae9caeda 100644 (file)
--- a/drivers/regulator/bd96801-regulator.c
+++ b/drivers/regulator/bd96801-regulator.c
@@ -1329,11 +1329,11 @@ static int bd96801_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id bd96801_pmic_id[] = {
-       { "bd96801-regulator", (kernel_ulong_t)&bd96801_data },
-       { "bd96802-regulator", (kernel_ulong_t)&bd96802_data },
-       { "bd96805-regulator", (kernel_ulong_t)&bd96805_data },
-       { "bd96806-regulator", (kernel_ulong_t)&bd96806_data },
-       { },
+       { .name = "bd96801-regulator", .driver_data = (kernel_ulong_t)&bd96801_data },
+       { .name = "bd96802-regulator", .driver_data = (kernel_ulong_t)&bd96802_data },
+       { .name = "bd96805-regulator", .driver_data = (kernel_ulong_t)&bd96805_data },
+       { .name = "bd96806-regulator", .driver_data = (kernel_ulong_t)&bd96806_data },
+       { }
 };
 MODULE_DEVICE_TABLE(platform, bd96801_pmic_id);
 

diff --git a/drivers/regulator/lp873x-regulator.c b/drivers/regulator/lp873x-regulator.c
index 84a134cfcd9c98d70a7dc95ecd6622502b6d90ea..7e837ddfa2367b61961d736f0f023cd09e3a7eae 100644 (file)
--- a/drivers/regulator/lp873x-regulator.c
+++ b/drivers/regulator/lp873x-regulator.c
@@ -180,7 +180,7 @@ static int lp873x_regulator_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id lp873x_regulator_id_table[] = {
-       { "lp873x-regulator", },
+       { .name = "lp873x-regulator" },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(platform, lp873x_regulator_id_table);

diff --git a/drivers/regulator/lp87565-regulator.c b/drivers/regulator/lp87565-regulator.c
index 1259b5d20153658b5d859b6e2151346812110d65..34e7a5d323d773809116357454971cac70b48328 100644 (file)
--- a/drivers/regulator/lp87565-regulator.c
+++ b/drivers/regulator/lp87565-regulator.c
@@ -229,8 +229,8 @@ static int lp87565_regulator_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id lp87565_regulator_id_table[] = {
-       { "lp87565-regulator", },
-       { "lp87565-q1-regulator", },
+       { .name = "lp87565-regulator" },
+       { .name = "lp87565-q1-regulator" },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(platform, lp87565_regulator_id_table);

diff --git a/drivers/regulator/max14577-regulator.c b/drivers/regulator/max14577-regulator.c
index 41fd15adfd1fddef1c296cc1489300a758732381..c9d8d5e31cbd87252fa683313bdc45ca5d5443dd 100644 (file)
--- a/drivers/regulator/max14577-regulator.c
+++ b/drivers/regulator/max14577-regulator.c
@@ -235,8 +235,8 @@ static int max14577_regulator_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id max14577_regulator_id[] = {
-       { "max14577-regulator", MAXIM_DEVICE_TYPE_MAX14577, },
-       { "max77836-regulator", MAXIM_DEVICE_TYPE_MAX77836, },
+       { .name = "max14577-regulator", .driver_data = MAXIM_DEVICE_TYPE_MAX14577 },
+       { .name = "max77836-regulator", .driver_data = MAXIM_DEVICE_TYPE_MAX77836 },
        { }
 };
 MODULE_DEVICE_TABLE(platform, max14577_regulator_id);

diff --git a/drivers/regulator/max77541-regulator.c b/drivers/regulator/max77541-regulator.c
index e6b3d9147c3738e0ef18dc549644fa1efa8435de..f2365930e9a93436e44c28eb5be22b7f000695e0 100644 (file)
--- a/drivers/regulator/max77541-regulator.c
+++ b/drivers/regulator/max77541-regulator.c
@@ -133,8 +133,8 @@ static int max77541_regulator_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id max77541_regulator_platform_id[] = {
-       { "max77540-regulator" },
-       { "max77541-regulator" },
+       { .name = "max77540-regulator" },
+       { .name = "max77541-regulator" },
        { }
 };
 MODULE_DEVICE_TABLE(platform, max77541_regulator_platform_id);

diff --git a/drivers/regulator/max77693-regulator.c b/drivers/regulator/max77693-regulator.c
index 72a67d0c5f1e892db0498f1e87ccaf8f6bfaa7bc..a8b3a2058d34def3f17c9f8162a0cc46421c53e4 100644 (file)
--- a/drivers/regulator/max77693-regulator.c
+++ b/drivers/regulator/max77693-regulator.c
@@ -271,9 +271,9 @@ static int max77693_pmic_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id max77693_pmic_id[] = {
-       { "max77693-pmic", TYPE_MAX77693 },
-       { "max77843-regulator", TYPE_MAX77843 },
-       {},
+       { .name = "max77693-pmic", .driver_data = TYPE_MAX77693 },
+       { .name = "max77843-regulator", .driver_data = TYPE_MAX77843 },
+       { }
 };
 
 MODULE_DEVICE_TABLE(platform, max77693_pmic_id);

diff --git a/drivers/regulator/max8998.c b/drivers/regulator/max8998.c
index 254a77887f66110d9fdde2d4d6224474fbd1f11d..cc85fbe8b77c371ed2107d22c3ec8fc9efb4e63b 100644 (file)
--- a/drivers/regulator/max8998.c
+++ b/drivers/regulator/max8998.c
@@ -752,8 +752,8 @@ static int max8998_pmic_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id max8998_pmic_id[] = {
-       { "max8998-pmic", TYPE_MAX8998 },
-       { "lp3974-pmic", TYPE_LP3974 },
+       { .name = "max8998-pmic", .driver_data = TYPE_MAX8998 },
+       { .name = "lp3974-pmic", .driver_data = TYPE_LP3974 },
        { }
 };
 MODULE_DEVICE_TABLE(platform, max8998_pmic_id);

diff --git a/drivers/regulator/mt6357-regulator.c b/drivers/regulator/mt6357-regulator.c
index 09feb454ab6b849d50f1b7f123766d9ae7e4fba5..815ef7d3e5be70dbfb2e8cb72ec1f14666c0d85b 100644 (file)
--- a/drivers/regulator/mt6357-regulator.c
+++ b/drivers/regulator/mt6357-regulator.c
@@ -431,8 +431,8 @@ static int mt6357_regulator_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id mt6357_platform_ids[] = {
-       { "mt6357-regulator" },
-       { /* sentinel */ },
+       { .name = "mt6357-regulator" },
+       { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(platform, mt6357_platform_ids);
 

diff --git a/drivers/regulator/pf1550-regulator.c b/drivers/regulator/pf1550-regulator.c
index 1d17265284604ae953a17fdfa15a327d1c55dcc6..610eac9bb9cb2c319f53c11507b65f27c791b9df 100644 (file)
--- a/drivers/regulator/pf1550-regulator.c
+++ b/drivers/regulator/pf1550-regulator.c
@@ -409,7 +409,7 @@ static int pf1550_regulator_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id pf1550_regulator_id[] = {
-       { "pf1550-regulator", },
+       { .name = "pf1550-regulator" },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(platform, pf1550_regulator_id);

diff --git a/drivers/regulator/qcom-pm8008-regulator.c b/drivers/regulator/qcom-pm8008-regulator.c
index 90c78ee1c37bf9bf69f43e0bb7798fed94590e95..9c9b8be2e15a499fa61a05cc9650338d0bbcd122 100644 (file)
--- a/drivers/regulator/qcom-pm8008-regulator.c
+++ b/drivers/regulator/qcom-pm8008-regulator.c
@@ -180,7 +180,7 @@ static int pm8008_regulator_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id pm8008_regulator_id_table[] = {
-       { "pm8008-regulator" },
+       { .name = "pm8008-regulator" },
        { }
 };
 MODULE_DEVICE_TABLE(platform, pm8008_regulator_id_table);

diff --git a/drivers/regulator/rt5033-regulator.c b/drivers/regulator/rt5033-regulator.c
index 2ba74f2055433915031d8f07c4cb87e9e2bdc459..3aeab9a5787115a5d227d6c7599d78797d2b9b3d 100644 (file)
--- a/drivers/regulator/rt5033-regulator.c
+++ b/drivers/regulator/rt5033-regulator.c
@@ -116,7 +116,7 @@ static int rt5033_regulator_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id rt5033_regulator_id[] = {
-       { "rt5033-regulator", },
+       { .name = "rt5033-regulator" },
        { }
 };
 MODULE_DEVICE_TABLE(platform, rt5033_regulator_id);

diff --git a/drivers/regulator/s2dos05-regulator.c b/drivers/regulator/s2dos05-regulator.c
index a1c394ddbaff6e7e49cc5bedfa48ac5c7f767ceb..6e25f663496a279aa6cc9040d9bfea57fc20ee71 100644 (file)
--- a/drivers/regulator/s2dos05-regulator.c
+++ b/drivers/regulator/s2dos05-regulator.c
@@ -146,8 +146,8 @@ static int s2dos05_pmic_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id s2dos05_pmic_id[] = {
-       { "s2dos05-regulator" },
-       { },
+       { .name = "s2dos05-regulator" },
+       { }
 };
 MODULE_DEVICE_TABLE(platform, s2dos05_pmic_id);
 

diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index 81cfd60460f8bb35a460f44753abfbb745121322..0fb54617b8a7d6abe59e95cddf467419605d28aa 100644 (file)
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -2266,15 +2266,15 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id s2mps11_pmic_id[] = {
-       { "s2mpg10-regulator", S2MPG10},
-       { "s2mpg11-regulator", S2MPG11},
-       { "s2mps11-regulator", S2MPS11X},
-       { "s2mps13-regulator", S2MPS13X},
-       { "s2mps14-regulator", S2MPS14X},
-       { "s2mps15-regulator", S2MPS15X},
-       { "s2mpu02-regulator", S2MPU02},
-       { "s2mpu05-regulator", S2MPU05},
-       { },
+       { .name = "s2mpg10-regulator", .driver_data = S2MPG10 },
+       { .name = "s2mpg11-regulator", .driver_data = S2MPG11 },
+       { .name = "s2mps11-regulator", .driver_data = S2MPS11X },
+       { .name = "s2mps13-regulator", .driver_data = S2MPS13X },
+       { .name = "s2mps14-regulator", .driver_data = S2MPS14X },
+       { .name = "s2mps15-regulator", .driver_data = S2MPS15X },
+       { .name = "s2mpu02-regulator", .driver_data = S2MPU02 },
+       { .name = "s2mpu05-regulator", .driver_data = S2MPU05 },
+       { }
 };
 MODULE_DEVICE_TABLE(platform, s2mps11_pmic_id);
 

diff --git a/drivers/regulator/sy7636a-regulator.c b/drivers/regulator/sy7636a-regulator.c
index 551647bc10520295f1d86e45f87065e8ba70a35f..c44c445ea1390e688cd6cada61ea18dfae93465c 100644 (file)
--- a/drivers/regulator/sy7636a-regulator.c
+++ b/drivers/regulator/sy7636a-regulator.c
@@ -147,7 +147,7 @@ static int sy7636a_regulator_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id sy7636a_regulator_id_table[] = {
-       { "sy7636a-regulator", },
+       { .name = "sy7636a-regulator" },
        { }
 };
 MODULE_DEVICE_TABLE(platform, sy7636a_regulator_id_table);

diff --git a/drivers/regulator/tps65086-regulator.c b/drivers/regulator/tps65086-regulator.c
index 2d284c64eeb7d8eb6cd1942403bce0f14bd6007f..94bf96856d10d8a63b6dd3a27a33f02ff1b18fd1 100644 (file)
--- a/drivers/regulator/tps65086-regulator.c
+++ b/drivers/regulator/tps65086-regulator.c
@@ -399,7 +399,7 @@ static int tps65086_regulator_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id tps65086_regulator_id_table[] = {
-       { "tps65086-regulator", },
+       { .name = "tps65086-regulator" },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(platform, tps65086_regulator_id_table);

diff --git a/drivers/regulator/tps65218-regulator.c b/drivers/regulator/tps65218-regulator.c
index f44b5767099c2d6b101d5fd01875740e5eeefe64..8df81ceeb845186fc2c0259f8f3beb0d77b2a8fc 100644 (file)
--- a/drivers/regulator/tps65218-regulator.c
+++ b/drivers/regulator/tps65218-regulator.c
@@ -341,7 +341,7 @@ static int tps65218_regulator_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id tps65218_regulator_id_table[] = {
-       { "tps65218-regulator", },
+       { .name = "tps65218-regulator" },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(platform, tps65218_regulator_id_table);

diff --git a/drivers/regulator/tps65219-regulator.c b/drivers/regulator/tps65219-regulator.c
index 324c3a33af8a42e38b3e191f4ee316454e30d44c..a667c3f44bb7942cfe2c9f2f941a46b92c2a1a61 100644 (file)
--- a/drivers/regulator/tps65219-regulator.c
+++ b/drivers/regulator/tps65219-regulator.c
@@ -541,9 +541,9 @@ static int tps65219_regulator_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id tps65219_regulator_id_table[] = {
-       { "tps65214-regulator", TPS65214 },
-       { "tps65215-regulator", TPS65215 },
-       { "tps65219-regulator", TPS65219 },
+       { .name = "tps65214-regulator", .driver_data = TPS65214 },
+       { .name = "tps65215-regulator", .driver_data = TPS65215 },
+       { .name = "tps65219-regulator", .driver_data = TPS65219 },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(platform, tps65219_regulator_id_table);

diff --git a/drivers/regulator/tps65912-regulator.c b/drivers/regulator/tps65912-regulator.c
index 7ff7877a2e09a9acdb73abadaee33b829635787a..4317ec62f18f3b95938add924f7570bd7d54ec13 100644 (file)
--- a/drivers/regulator/tps65912-regulator.c
+++ b/drivers/regulator/tps65912-regulator.c
@@ -142,7 +142,7 @@ static int tps65912_regulator_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id tps65912_regulator_id_table[] = {
-       { "tps65912-regulator", },
+       { .name = "tps65912-regulator" },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(platform, tps65912_regulator_id_table);