Sandro/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-09-18 22:59:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

mfd: Initialize spi_device_id arrays using member names

Browse Source 
While being less compact, using named initializers allows to more easily
see which members of the structs are assigned which value without having
to lookup the declaration of the struct. And it's also more robust
against changes to the struct definition.

The mentioned robustness is relevant for a planned change to struct
spi_device_id that replaces .driver_data by an anonymous union.

Also adapt spacing and usage of commas to the most common style.

This patch doesn't modify the compiled array, only its representation
in source form benefits.

Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/f83c8292e7e3ba9425792591fb136d4ae1468215.1783003256.git.u.kleine-koenig@baylibre.com
Signed-off-by: Lee Jones <lee@kernel.org>
This commit is contained in:
Uwe Kleine-König (The Capable Hub)
2026-07-30 14:32:55 +01:00
committed by Lee Jones
parent e9929b4b61
commit 02c54e9078
8 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/mfd/arizona-spi.c
+6 -6
View File
@@ -255,12 +255,12 @@ static void arizona_spi_remove(struct spi_device *spi)
}
static const struct spi_device_id arizona_spi_ids[] = {
{ "wm5102", WM5102 },
{ "wm5110", WM5110 },
{ "wm8280", WM8280 },
{ "wm1831", WM1831 },
{ "cs47l24", CS47L24 },
{ },
{ .name = "wm5102", .driver_data = WM5102 },
{ .name = "wm5110", .driver_data = WM5110 },
{ .name = "wm8280", .driver_data = WM8280 },
{ .name = "wm1831", .driver_data = WM1831 },
{ .name = "cs47l24", .driver_data = CS47L24 },
{ }
};
MODULE_DEVICE_TABLE(spi, arizona_spi_ids);
drivers/mfd/cs40l50-spi.c
+2 -2
View File
@@ -40,8 +40,8 @@ static void cs40l50_spi_remove(struct spi_device *spi)
}
static const struct spi_device_id cs40l50_id_spi[] = {
{ "cs40l50" },
{}
{ .name = "cs40l50" },
{ }
};
MODULE_DEVICE_TABLE(spi, cs40l50_id_spi);
drivers/mfd/da9052-spi.c
+6 -6
View File
@@ -63,12 +63,12 @@ static void da9052_spi_remove(struct spi_device *spi)
}
static const struct spi_device_id da9052_spi_id[] = {
{"da9052", DA9052},
{"da9053-aa", DA9053_AA},
{"da9053-ba", DA9053_BA},
{"da9053-bb", DA9053_BB},
{"da9053-bc", DA9053_BC},
{}
{ .name = "da9052", .driver_data = DA9052 },
{ .name = "da9053-aa", .driver_data = DA9053_AA },
{ .name = "da9053-ba", .driver_data = DA9053_BA },
{ .name = "da9053-bb", .driver_data = DA9053_BB },
{ .name = "da9053-bc", .driver_data = DA9053_BC },
{ }
};
static struct spi_driver da9052_spi_driver = {
drivers/mfd/intel-m10-bmc-spi.c
+3 -3
View File
@@ -160,9 +160,9 @@ static const struct intel_m10bmc_platform_info m10bmc_spi_n5010 = {
};
static const struct spi_device_id m10bmc_spi_id[] = {
{ "m10-n3000", (kernel_ulong_t)&m10bmc_spi_n3000 },
{ "m10-d5005", (kernel_ulong_t)&m10bmc_spi_d5005 },
{ "m10-n5010", (kernel_ulong_t)&m10bmc_spi_n5010 },
{ .name = "m10-n3000", .driver_data = (kernel_ulong_t)&m10bmc_spi_n3000 },
{ .name = "m10-d5005", .driver_data = (kernel_ulong_t)&m10bmc_spi_d5005 },
{ .name = "m10-n5010", .driver_data = (kernel_ulong_t)&m10bmc_spi_n5010 },
{ }
};
MODULE_DEVICE_TABLE(spi, m10bmc_spi_id);
drivers/mfd/madera-spi.c
+9 -9
View File
@@ -112,15 +112,15 @@ static void madera_spi_remove(struct spi_device *spi)
}
static const struct spi_device_id madera_spi_ids[] = {
{ "cs47l15", CS47L15 },
{ "cs47l35", CS47L35 },
{ "cs47l85", CS47L85 },
{ "cs47l90", CS47L90 },
{ "cs47l91", CS47L91 },
{ "cs42l92", CS42L92 },
{ "cs47l92", CS47L92 },
{ "cs47l93", CS47L93 },
{ "wm1840", WM1840 },
{ .name = "cs47l15", .driver_data = CS47L15 },
{ .name = "cs47l35", .driver_data = CS47L35 },
{ .name = "cs47l85", .driver_data = CS47L85 },
{ .name = "cs47l90", .driver_data = CS47L90 },
{ .name = "cs47l91", .driver_data = CS47L91 },
{ .name = "cs42l92", .driver_data = CS42L92 },
{ .name = "cs47l92", .driver_data = CS47L92 },
{ .name = "cs47l93", .driver_data = CS47L93 },
{ .name = "wm1840", .driver_data = WM1840 },
{ }
};
MODULE_DEVICE_TABLE(spi, madera_spi_ids);
drivers/mfd/rsmu_spi.c
+6 -6
View File
@@ -239,12 +239,12 @@ static void rsmu_spi_remove(struct spi_device *client)
}
static const struct spi_device_id rsmu_spi_id[] = {
{ "8a34000", RSMU_CM },
{ "8a34001", RSMU_CM },
{ "8a34002", RSMU_CM },
{ "82p33810", RSMU_SABRE },
{ "82p33811", RSMU_SABRE },
{}
{ .name = "8a34000", .driver_data = RSMU_CM },
{ .name = "8a34001", .driver_data = RSMU_CM },
{ .name = "8a34002", .driver_data = RSMU_CM },
{ .name = "82p33810", .driver_data = RSMU_SABRE },
{ .name = "82p33811", .driver_data = RSMU_SABRE },
{ }
};
MODULE_DEVICE_TABLE(spi, rsmu_spi_id);
drivers/mfd/stmpe-spi.c
+6 -6
View File
@@ -121,12 +121,12 @@ static const struct of_device_id stmpe_spi_of_match[] = {
MODULE_DEVICE_TABLE(of, stmpe_spi_of_match);
static const struct spi_device_id stmpe_spi_id[] = {
{ "stmpe610", STMPE610 },
{ "stmpe801", STMPE801 },
{ "stmpe811", STMPE811 },
{ "stmpe1601", STMPE1601 },
{ "stmpe2401", STMPE2401 },
{ "stmpe2403", STMPE2403 },
{ .name = "stmpe610", .driver_data = STMPE610 },
{ .name = "stmpe801", .driver_data = STMPE801 },
{ .name = "stmpe811", .driver_data = STMPE811 },
{ .name = "stmpe1601", .driver_data = STMPE1601 },
{ .name = "stmpe2401", .driver_data = STMPE2401 },
{ .name = "stmpe2403", .driver_data = STMPE2403 },
{ }
};
MODULE_DEVICE_TABLE(spi, stmpe_spi_id);
drivers/mfd/wm831x-spi.c
+8 -8
View File
@@ -77,14 +77,14 @@ static const struct dev_pm_ops wm831x_spi_pm = {
};
static const struct spi_device_id wm831x_spi_ids[] = {
{ "wm8310", WM8310 },
{ "wm8311", WM8311 },
{ "wm8312", WM8312 },
{ "wm8320", WM8320 },
{ "wm8321", WM8321 },
{ "wm8325", WM8325 },
{ "wm8326", WM8326 },
{ },
{ .name = "wm8310", .driver_data = WM8310 },
{ .name = "wm8311", .driver_data = WM8311 },
{ .name = "wm8312", .driver_data = WM8312 },
{ .name = "wm8320", .driver_data = WM8320 },
{ .name = "wm8321", .driver_data = WM8321 },
{ .name = "wm8325", .driver_data = WM8325 },
{ .name = "wm8326", .driver_data = WM8326 },
{ }
};
static struct spi_driver wm831x_spi_driver = {