Skip to content

Commit d350283

Browse files
ukleinekbroonie
ukleinek
authored and
broonie
committed
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>
1 parent 4079e9d commit d350283

24 files changed

Lines changed: 54 additions & 54 deletions

‎drivers/regulator/88pm886-regulator.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ static int pm886_regulator_probe(struct platform_device *pdev)
373373
}
374374

375375
static const struct platform_device_id pm886_regulator_id_table[] = {
376-
{ "88pm886-regulator", },
376+
{ .name = "88pm886-regulator" },
377377
{ }
378378
};
379379
MODULE_DEVICE_TABLE(platform, pm886_regulator_id_table);

‎drivers/regulator/bd71815-regulator.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -607,8 +607,8 @@ static int bd7181x_probe(struct platform_device *pdev)
607607
}
608608

609609
static const struct platform_device_id bd7181x_pmic_id[] = {
610-
{ "bd71815-pmic", ROHM_CHIP_TYPE_BD71815 },
611-
{ },
610+
{ .name = "bd71815-pmic", .driver_data = ROHM_CHIP_TYPE_BD71815 },
611+
{ }
612612
};
613613
MODULE_DEVICE_TABLE(platform, bd7181x_pmic_id);
614614

‎drivers/regulator/bd71828-regulator.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1691,9 +1691,9 @@ static int bd71828_probe(struct platform_device *pdev)
16911691
}
16921692

16931693
static const struct platform_device_id bd71828_pmic_id[] = {
1694-
{ "bd71828-pmic", ROHM_CHIP_TYPE_BD71828 },
1695-
{ "bd72720-pmic", ROHM_CHIP_TYPE_BD72720 },
1696-
{ },
1694+
{ .name = "bd71828-pmic", .driver_data = ROHM_CHIP_TYPE_BD71828 },
1695+
{ .name = "bd72720-pmic", .driver_data = ROHM_CHIP_TYPE_BD72720 },
1696+
{ }
16971697
};
16981698
MODULE_DEVICE_TABLE(platform, bd71828_pmic_id);
16991699

‎drivers/regulator/bd718x7-regulator.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1816,9 +1816,9 @@ static int bd718xx_probe(struct platform_device *pdev)
18161816
}
18171817

18181818
static const struct platform_device_id bd718x7_pmic_id[] = {
1819-
{ "bd71837-pmic", ROHM_CHIP_TYPE_BD71837 },
1820-
{ "bd71847-pmic", ROHM_CHIP_TYPE_BD71847 },
1821-
{ },
1819+
{ .name = "bd71837-pmic", .driver_data = ROHM_CHIP_TYPE_BD71837 },
1820+
{ .name = "bd71847-pmic", .driver_data = ROHM_CHIP_TYPE_BD71847 },
1821+
{ }
18221822
};
18231823
MODULE_DEVICE_TABLE(platform, bd718x7_pmic_id);
18241824

‎drivers/regulator/bd9571mwv-regulator.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,8 @@ static int bd9571mwv_regulator_probe(struct platform_device *pdev)
344344
}
345345

346346
static const struct platform_device_id bd9571mwv_regulator_id_table[] = {
347-
{ "bd9571mwv-regulator", ROHM_CHIP_TYPE_BD9571 },
348-
{ "bd9574mwf-regulator", ROHM_CHIP_TYPE_BD9574 },
347+
{ .name = "bd9571mwv-regulator", .driver_data = ROHM_CHIP_TYPE_BD9571 },
348+
{ .name = "bd9574mwf-regulator", .driver_data = ROHM_CHIP_TYPE_BD9574 },
349349
{ /* sentinel */ }
350350
};
351351
MODULE_DEVICE_TABLE(platform, bd9571mwv_regulator_id_table);

‎drivers/regulator/bd9576-regulator.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1117,9 +1117,9 @@ static int bd957x_probe(struct platform_device *pdev)
11171117
}
11181118

11191119
static const struct platform_device_id bd957x_pmic_id[] = {
1120-
{ "bd9573-regulator", ROHM_CHIP_TYPE_BD9573 },
1121-
{ "bd9576-regulator", ROHM_CHIP_TYPE_BD9576 },
1122-
{ },
1120+
{ .name = "bd9573-regulator", .driver_data = ROHM_CHIP_TYPE_BD9573 },
1121+
{ .name = "bd9576-regulator", .driver_data = ROHM_CHIP_TYPE_BD9576 },
1122+
{ }
11231123
};
11241124
MODULE_DEVICE_TABLE(platform, bd957x_pmic_id);
11251125

‎drivers/regulator/bd96801-regulator.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1329,11 +1329,11 @@ static int bd96801_probe(struct platform_device *pdev)
13291329
}
13301330

13311331
static const struct platform_device_id bd96801_pmic_id[] = {
1332-
{ "bd96801-regulator", (kernel_ulong_t)&bd96801_data },
1333-
{ "bd96802-regulator", (kernel_ulong_t)&bd96802_data },
1334-
{ "bd96805-regulator", (kernel_ulong_t)&bd96805_data },
1335-
{ "bd96806-regulator", (kernel_ulong_t)&bd96806_data },
1336-
{ },
1332+
{ .name = "bd96801-regulator", .driver_data = (kernel_ulong_t)&bd96801_data },
1333+
{ .name = "bd96802-regulator", .driver_data = (kernel_ulong_t)&bd96802_data },
1334+
{ .name = "bd96805-regulator", .driver_data = (kernel_ulong_t)&bd96805_data },
1335+
{ .name = "bd96806-regulator", .driver_data = (kernel_ulong_t)&bd96806_data },
1336+
{ }
13371337
};
13381338
MODULE_DEVICE_TABLE(platform, bd96801_pmic_id);
13391339

‎drivers/regulator/lp873x-regulator.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ static int lp873x_regulator_probe(struct platform_device *pdev)
180180
}
181181

182182
static const struct platform_device_id lp873x_regulator_id_table[] = {
183-
{ "lp873x-regulator", },
183+
{ .name = "lp873x-regulator" },
184184
{ /* sentinel */ }
185185
};
186186
MODULE_DEVICE_TABLE(platform, lp873x_regulator_id_table);

‎drivers/regulator/lp87565-regulator.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ static int lp87565_regulator_probe(struct platform_device *pdev)
229229
}
230230

231231
static const struct platform_device_id lp87565_regulator_id_table[] = {
232-
{ "lp87565-regulator", },
233-
{ "lp87565-q1-regulator", },
232+
{ .name = "lp87565-regulator" },
233+
{ .name = "lp87565-q1-regulator" },
234234
{ /* sentinel */ }
235235
};
236236
MODULE_DEVICE_TABLE(platform, lp87565_regulator_id_table);

‎drivers/regulator/max14577-regulator.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ static int max14577_regulator_probe(struct platform_device *pdev)
235235
}
236236

237237
static const struct platform_device_id max14577_regulator_id[] = {
238-
{ "max14577-regulator", MAXIM_DEVICE_TYPE_MAX14577, },
239-
{ "max77836-regulator", MAXIM_DEVICE_TYPE_MAX77836, },
238+
{ .name = "max14577-regulator", .driver_data = MAXIM_DEVICE_TYPE_MAX14577 },
239+
{ .name = "max77836-regulator", .driver_data = MAXIM_DEVICE_TYPE_MAX77836 },
240240
{ }
241241
};
242242
MODULE_DEVICE_TABLE(platform, max14577_regulator_id);

0 commit comments

Comments
 (0)