pinctrl: 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: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> # renesas
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> # renesas
Signed-off-by: Linus Walleij <linusw@kernel.org>

diff --git a/drivers/pinctrl/cirrus/pinctrl-cs42l43.c b/drivers/pinctrl/cirrus/pinctrl-cs42l43.c
index 305233fc1987625bd3616085eeb544a37d171a6b..8990fab0446cfeb9b105a55289cac8f7f96f2cc7 100644 (file)
--- a/drivers/pinctrl/cirrus/pinctrl-cs42l43.c
+++ b/drivers/pinctrl/cirrus/pinctrl-cs42l43.c
@@ -602,8 +602,8 @@ static int cs42l43_pin_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id cs42l43_pin_id_table[] = {
-       { "cs42l43-pinctrl", },
-       {}
+       { .name = "cs42l43-pinctrl" },
+       { }
 };
 MODULE_DEVICE_TABLE(platform, cs42l43_pin_id_table);
 

diff --git a/drivers/pinctrl/intel/pinctrl-broxton.c b/drivers/pinctrl/intel/pinctrl-broxton.c
index 3d3c1706928a3baaa92b63c435930ef2ef7736f6..a33100f284887bff60a984287e2bdeacd29f9d83 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl-broxton.c
+++ b/drivers/pinctrl/intel/pinctrl-broxton.c
@@ -995,8 +995,8 @@ static const struct acpi_device_id bxt_pinctrl_acpi_match[] = {
 MODULE_DEVICE_TABLE(acpi, bxt_pinctrl_acpi_match);
 
 static const struct platform_device_id bxt_pinctrl_platform_ids[] = {
-       { "apollolake-pinctrl", (kernel_ulong_t)apl_pinctrl_soc_data },
-       { "broxton-pinctrl", (kernel_ulong_t)bxt_pinctrl_soc_data },
+       { .name = "apollolake-pinctrl", .driver_data = (kernel_ulong_t)apl_pinctrl_soc_data },
+       { .name = "broxton-pinctrl", .driver_data = (kernel_ulong_t)bxt_pinctrl_soc_data },
        { }
 };
 MODULE_DEVICE_TABLE(platform, bxt_pinctrl_platform_ids);

diff --git a/drivers/pinctrl/intel/pinctrl-denverton.c b/drivers/pinctrl/intel/pinctrl-denverton.c
index 4a1d346fb30c706bc255ef524c1d91bfdb944f80..09aee90dee820b8cf4e71b7c91f7898a5808cb4a 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl-denverton.c
+++ b/drivers/pinctrl/intel/pinctrl-denverton.c
@@ -250,7 +250,7 @@ static const struct acpi_device_id dnv_pinctrl_acpi_match[] = {
 MODULE_DEVICE_TABLE(acpi, dnv_pinctrl_acpi_match);
 
 static const struct platform_device_id dnv_pinctrl_platform_ids[] = {
-       { "denverton-pinctrl", (kernel_ulong_t)&dnv_soc_data },
+       { .name = "denverton-pinctrl", .driver_data = (kernel_ulong_t)&dnv_soc_data },
        { }
 };
 MODULE_DEVICE_TABLE(platform, dnv_pinctrl_platform_ids);

diff --git a/drivers/pinctrl/pinctrl-tps6594.c b/drivers/pinctrl/pinctrl-tps6594.c
index 6726853110d10f87034517369204d1a2df22aca3..55dfa843e35e2424514502bdb3ddf39f551dd3dc 100644 (file)
--- a/drivers/pinctrl/pinctrl-tps6594.c
+++ b/drivers/pinctrl/pinctrl-tps6594.c
@@ -562,8 +562,8 @@ static int tps6594_pinctrl_probe(struct platform_device *pdev)
 }
 
 static const struct platform_device_id tps6594_pinctrl_id_table[] = {
-       { "tps6594-pinctrl", },
-       {}
+       { .name = "tps6594-pinctrl" },
+       { }
 };
 MODULE_DEVICE_TABLE(platform, tps6594_pinctrl_id_table);
 

diff --git a/drivers/pinctrl/renesas/core.c b/drivers/pinctrl/renesas/core.c
index 0840668638d90f2294bf98757bfb271d01b5c273..a466ebf9959390c33588271504a7772738696d0a 100644 (file)
--- a/drivers/pinctrl/renesas/core.c
+++ b/drivers/pinctrl/renesas/core.c
@@ -1380,40 +1380,40 @@ static int sh_pfc_probe(struct platform_device *pdev)
 
 static const struct platform_device_id sh_pfc_id_table[] = {
 #ifdef CONFIG_PINCTRL_PFC_SH7203
-       { "pfc-sh7203", (kernel_ulong_t)&sh7203_pinmux_info },
+       { .name = "pfc-sh7203", .driver_data = (kernel_ulong_t)&sh7203_pinmux_info },
 #endif
 #ifdef CONFIG_PINCTRL_PFC_SH7264
-       { "pfc-sh7264", (kernel_ulong_t)&sh7264_pinmux_info },
+       { .name = "pfc-sh7264", .driver_data = (kernel_ulong_t)&sh7264_pinmux_info },
 #endif
 #ifdef CONFIG_PINCTRL_PFC_SH7269
-       { "pfc-sh7269", (kernel_ulong_t)&sh7269_pinmux_info },
+       { .name = "pfc-sh7269", .driver_data = (kernel_ulong_t)&sh7269_pinmux_info },
 #endif
 #ifdef CONFIG_PINCTRL_PFC_SH7720
-       { "pfc-sh7720", (kernel_ulong_t)&sh7720_pinmux_info },
+       { .name = "pfc-sh7720", .driver_data = (kernel_ulong_t)&sh7720_pinmux_info },
 #endif
 #ifdef CONFIG_PINCTRL_PFC_SH7722
-       { "pfc-sh7722", (kernel_ulong_t)&sh7722_pinmux_info },
+       { .name = "pfc-sh7722", .driver_data = (kernel_ulong_t)&sh7722_pinmux_info },
 #endif
 #ifdef CONFIG_PINCTRL_PFC_SH7723
-       { "pfc-sh7723", (kernel_ulong_t)&sh7723_pinmux_info },
+       { .name = "pfc-sh7723", .driver_data = (kernel_ulong_t)&sh7723_pinmux_info },
 #endif
 #ifdef CONFIG_PINCTRL_PFC_SH7724
-       { "pfc-sh7724", (kernel_ulong_t)&sh7724_pinmux_info },
+       { .name = "pfc-sh7724", .driver_data = (kernel_ulong_t)&sh7724_pinmux_info },
 #endif
 #ifdef CONFIG_PINCTRL_PFC_SH7734
-       { "pfc-sh7734", (kernel_ulong_t)&sh7734_pinmux_info },
+       { .name = "pfc-sh7734", .driver_data = (kernel_ulong_t)&sh7734_pinmux_info },
 #endif
 #ifdef CONFIG_PINCTRL_PFC_SH7757
-       { "pfc-sh7757", (kernel_ulong_t)&sh7757_pinmux_info },
+       { .name = "pfc-sh7757", .driver_data = (kernel_ulong_t)&sh7757_pinmux_info },
 #endif
 #ifdef CONFIG_PINCTRL_PFC_SH7785
-       { "pfc-sh7785", (kernel_ulong_t)&sh7785_pinmux_info },
+       { .name = "pfc-sh7785", .driver_data = (kernel_ulong_t)&sh7785_pinmux_info },
 #endif
 #ifdef CONFIG_PINCTRL_PFC_SH7786
-       { "pfc-sh7786", (kernel_ulong_t)&sh7786_pinmux_info },
+       { .name = "pfc-sh7786", .driver_data = (kernel_ulong_t)&sh7786_pinmux_info },
 #endif
 #ifdef CONFIG_PINCTRL_PFC_SHX3
-       { "pfc-shx3", (kernel_ulong_t)&shx3_pinmux_info },
+       { .name = "pfc-shx3", .driver_data = (kernel_ulong_t)&shx3_pinmux_info },
 #endif
        { /* sentinel */ }
 };