From d4011cda7ff23b0c6561d6edbe6dfd13099169a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= Date: Tue, 16 Jun 2026 17:25:10 +0200 Subject: [PATCH] watchdog: Use named initializers for platform_device_id arrays MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 union. For one driver drop the unused assignment to .driver_data instead. While touching these arrays unify spacing and usage of commas. There is no effect on the compiled arrays. Signed-off-by: Uwe Kleine-König (The Capable Hub) Link: https://lore.kernel.org/r/22bc09d0c9c8dfe75a205b0a9ccc98ccfba1de10.1781622532.git.u.kleine-koenig@baylibre.com Signed-off-by: Guenter Roeck --- drivers/watchdog/cros_ec_wdt.c | 4 ++-- drivers/watchdog/max63xx_wdt.c | 14 +++++++------- drivers/watchdog/max77620_wdt.c | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/watchdog/cros_ec_wdt.c b/drivers/watchdog/cros_ec_wdt.c index 9a4a59b39ed9..2283419d8b38 100644 --- a/drivers/watchdog/cros_ec_wdt.c +++ b/drivers/watchdog/cros_ec_wdt.c @@ -178,8 +178,8 @@ static int __maybe_unused cros_ec_wdt_resume(struct platform_device *pdev) } static const struct platform_device_id cros_ec_wdt_id[] = { - { DRV_NAME, 0 }, - {} + { .name = DRV_NAME }, + { } }; static struct platform_driver cros_ec_wdt_driver = { diff --git a/drivers/watchdog/max63xx_wdt.c b/drivers/watchdog/max63xx_wdt.c index 3b4f3134d1c4..e9073df1a7de 100644 --- a/drivers/watchdog/max63xx_wdt.c +++ b/drivers/watchdog/max63xx_wdt.c @@ -245,13 +245,13 @@ static int max63xx_wdt_probe(struct platform_device *pdev) } static const struct platform_device_id max63xx_id_table[] = { - { "max6369_wdt", (kernel_ulong_t)max6369_table, }, - { "max6370_wdt", (kernel_ulong_t)max6369_table, }, - { "max6371_wdt", (kernel_ulong_t)max6371_table, }, - { "max6372_wdt", (kernel_ulong_t)max6371_table, }, - { "max6373_wdt", (kernel_ulong_t)max6373_table, }, - { "max6374_wdt", (kernel_ulong_t)max6373_table, }, - { }, + { .name = "max6369_wdt", .driver_data = (kernel_ulong_t)max6369_table }, + { .name = "max6370_wdt", .driver_data = (kernel_ulong_t)max6369_table }, + { .name = "max6371_wdt", .driver_data = (kernel_ulong_t)max6371_table }, + { .name = "max6372_wdt", .driver_data = (kernel_ulong_t)max6371_table }, + { .name = "max6373_wdt", .driver_data = (kernel_ulong_t)max6373_table }, + { .name = "max6374_wdt", .driver_data = (kernel_ulong_t)max6373_table }, + { } }; MODULE_DEVICE_TABLE(platform, max63xx_id_table); diff --git a/drivers/watchdog/max77620_wdt.c b/drivers/watchdog/max77620_wdt.c index 6ce435741d97..ed5a98cea525 100644 --- a/drivers/watchdog/max77620_wdt.c +++ b/drivers/watchdog/max77620_wdt.c @@ -235,9 +235,9 @@ static int max77620_wdt_probe(struct platform_device *pdev) } static const struct platform_device_id max77620_wdt_devtype[] = { - { "max77620-watchdog", (kernel_ulong_t)&max77620_wdt_data }, - { "max77714-watchdog", (kernel_ulong_t)&max77714_wdt_data }, - { }, + { .name = "max77620-watchdog", .driver_data = (kernel_ulong_t)&max77620_wdt_data }, + { .name = "max77714-watchdog", .driver_data = (kernel_ulong_t)&max77714_wdt_data }, + { } }; MODULE_DEVICE_TABLE(platform, max77620_wdt_devtype);