spi: 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 union.

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>
Link: https://patch.msgid.link/3fcd432a505bb1bb7f8ef0fba9162243200b3347.1780606153.git.u.kleine-koenig@baylibre.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-altera-platform.c b/drivers/spi/spi-altera-platform.c
index 3ee5d3480bb46f4fd0dd4dbed3402d31e26b9103..3de7df73f2165216d107787aaf744da46a1f5d74 100644 (file)
--- a/drivers/spi/spi-altera-platform.c
+++ b/drivers/spi/spi-altera-platform.c
@@ -139,8 +139,8 @@ MODULE_DEVICE_TABLE(of, altera_spi_match);
 #endif /* CONFIG_OF */
 
 static const struct platform_device_id altera_spi_ids[] = {
-       { DRV_NAME,             ALTERA_SPI_TYPE_UNKNOWN },
-       { "subdev_spi_altera",  ALTERA_SPI_TYPE_SUBDEV },
+       { .name = DRV_NAME,             .driver_data = ALTERA_SPI_TYPE_UNKNOWN },
+       { .name = "subdev_spi_altera",  .driver_data = ALTERA_SPI_TYPE_SUBDEV },
        { }
 };
 MODULE_DEVICE_TABLE(platform, altera_spi_ids);

diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c
index f8cfe535b2a3c7feef8a9b4fcac92270dee48d30..43d7b54e3ae85a6d47b82c46aadc2ee211d552e4 100644 (file)
--- a/drivers/spi/spi-bcm63xx.c
+++ b/drivers/spi/spi-bcm63xx.c
@@ -477,8 +477,7 @@ static const struct platform_device_id bcm63xx_spi_dev_match[] = {
                .name = "bcm6358-spi",
                .driver_data = (unsigned long)bcm6358_spi_reg_offsets,
        },
-       {
-       },
+       { }
 };
 MODULE_DEVICE_TABLE(platform, bcm63xx_spi_dev_match);
 

diff --git a/drivers/spi/spi-cs42l43.c b/drivers/spi/spi-cs42l43.c
index 68f208ef1e01f9f95831466a84b9715a3f83d6f8..6961e36b89d18d2e3cd9b73685cb8903bdb15b1d 100644 (file)
--- a/drivers/spi/spi-cs42l43.c
+++ b/drivers/spi/spi-cs42l43.c
@@ -438,8 +438,8 @@ static int cs42l43_spi_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id cs42l43_spi_id_table[] = {
-       { "cs42l43-spi", },
-       {}
+       { .name = "cs42l43-spi" },
+       { }
 };
 MODULE_DEVICE_TABLE(platform, cs42l43_spi_id_table);
 

diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index a0c77e02bc90d7ccf549d205d01fc9692b9e5d2e..38df676774ee1af172ad21b3612f584ee9c2196f 100644 (file)
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -1377,8 +1377,8 @@ error2:
 }
 
 static const struct platform_device_id spi_driver_ids[] = {
-       { "rspi",       (kernel_ulong_t)&rspi_ops },
-       {},
+       { .name = "rspi", .driver_data = (kernel_ulong_t)&rspi_ops },
+       { }
 };
 
 MODULE_DEVICE_TABLE(platform, spi_driver_ids);

diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 37176e557099d1d86313fcdcac1abc1bebaa5db2..28c56b06fa99d3670cfaf3b20515382177b75982 100644 (file)
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -1613,10 +1613,10 @@ static const struct s3c64xx_spi_port_config gs101_spi_port_config = {
 
 static const struct platform_device_id s3c64xx_spi_driver_ids[] = {
        {
-               .name           = "s3c6410-spi",
-               .driver_data    = (kernel_ulong_t)&s3c6410_spi_port_config,
+               .name = "s3c6410-spi",
+               .driver_data = (kernel_ulong_t)&s3c6410_spi_port_config,
        },
-       { },
+       { }
 };
 MODULE_DEVICE_TABLE(platform, s3c64xx_spi_driver_ids);
 

diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
index 070e16bc764f61f485f8c6c61008c26907fa791c..f23db85a1889d509feae8f199968fc9d2457ab06 100644 (file)
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -1310,8 +1310,8 @@ static void sh_msiof_spi_remove(struct platform_device *pdev)
 }
 
 static const struct platform_device_id spi_driver_ids[] = {
-       { "spi_sh_msiof",       (kernel_ulong_t)&sh_data },
-       {},
+       { .name = "spi_sh_msiof", .driver_data = (kernel_ulong_t)&sh_data },
+       { }
 };
 MODULE_DEVICE_TABLE(platform, spi_driver_ids);