Browse Source

pinctrl: constify of_device_id array

of_device_id is always used as const.
(See driver.of_match_table and open firmware functions)

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
Acked-by: Maxime Coquelin <maxime.coquelin@st.com>
Acked-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
Acked-by: Lee Jones <lee@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Fabian Frederick 10 years ago
parent
commit
baa9946e32
32 changed files with 38 additions and 34 deletions
  1. 1 1
      drivers/pinctrl/bcm/pinctrl-bcm2835.c
  2. 3 1
      drivers/pinctrl/mediatek/pinctrl-mt8135.c
  3. 3 1
      drivers/pinctrl/mediatek/pinctrl-mt8173.c
  4. 1 1
      drivers/pinctrl/mvebu/pinctrl-armada-370.c
  5. 1 1
      drivers/pinctrl/mvebu/pinctrl-armada-375.c
  6. 1 1
      drivers/pinctrl/mvebu/pinctrl-armada-38x.c
  7. 1 1
      drivers/pinctrl/mvebu/pinctrl-armada-39x.c
  8. 1 1
      drivers/pinctrl/mvebu/pinctrl-armada-xp.c
  9. 1 1
      drivers/pinctrl/mvebu/pinctrl-kirkwood.c
  10. 1 1
      drivers/pinctrl/mvebu/pinctrl-orion.c
  11. 1 1
      drivers/pinctrl/pinctrl-as3722.c
  12. 2 2
      drivers/pinctrl/pinctrl-at91.c
  13. 1 1
      drivers/pinctrl/pinctrl-palmas.c
  14. 2 2
      drivers/pinctrl/pinctrl-single.c
  15. 1 1
      drivers/pinctrl/pinctrl-st.c
  16. 1 1
      drivers/pinctrl/pinctrl-tz1090-pdc.c
  17. 1 1
      drivers/pinctrl/pinctrl-tz1090.c
  18. 1 1
      drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c
  19. 1 1
      drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c
  20. 1 1
      drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c
  21. 1 1
      drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c
  22. 1 1
      drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c
  23. 1 1
      drivers/pinctrl/sunxi/pinctrl-sun6i-a31s.c
  24. 1 1
      drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c
  25. 1 1
      drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c
  26. 1 1
      drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c
  27. 1 1
      drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c
  28. 1 1
      drivers/pinctrl/vt8500/pinctrl-vt8500.c
  29. 1 1
      drivers/pinctrl/vt8500/pinctrl-wm8505.c
  30. 1 1
      drivers/pinctrl/vt8500/pinctrl-wm8650.c
  31. 1 1
      drivers/pinctrl/vt8500/pinctrl-wm8750.c
  32. 1 1
      drivers/pinctrl/vt8500/pinctrl-wm8850.c

+ 1 - 1
drivers/pinctrl/bcm/pinctrl-bcm2835.c

@@ -1051,7 +1051,7 @@ static int bcm2835_pinctrl_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static struct of_device_id bcm2835_pinctrl_match[] = {
+static const struct of_device_id bcm2835_pinctrl_match[] = {
 	{ .compatible = "brcm,bcm2835-gpio" },
 	{}
 };

+ 3 - 1
drivers/pinctrl/mediatek/pinctrl-mt8135.c

@@ -348,7 +348,9 @@ static int mt8135_pinctrl_probe(struct platform_device *pdev)
 }
 
 static const struct of_device_id mt8135_pctrl_match[] = {
-	{ .compatible = "mediatek,mt8135-pinctrl", },
+	{
+		.compatible = "mediatek,mt8135-pinctrl",
+	},
 	{ }
 };
 MODULE_DEVICE_TABLE(of, mt8135_pctrl_match);

+ 3 - 1
drivers/pinctrl/mediatek/pinctrl-mt8173.c

@@ -428,7 +428,9 @@ static int mt8173_pinctrl_probe(struct platform_device *pdev)
 }
 
 static const struct of_device_id mt8173_pctrl_match[] = {
-	{ .compatible = "mediatek,mt8173-pinctrl", },
+	{
+		.compatible = "mediatek,mt8173-pinctrl",
+	},
 	{ }
 };
 MODULE_DEVICE_TABLE(of, mt8173_pctrl_match);

+ 1 - 1
drivers/pinctrl/mvebu/pinctrl-armada-370.c

@@ -379,7 +379,7 @@ static struct mvebu_mpp_mode mv88f6710_mpp_modes[] = {
 
 static struct mvebu_pinctrl_soc_info armada_370_pinctrl_info;
 
-static struct of_device_id armada_370_pinctrl_of_match[] = {
+static const struct of_device_id armada_370_pinctrl_of_match[] = {
 	{ .compatible = "marvell,mv88f6710-pinctrl" },
 	{ },
 };

+ 1 - 1
drivers/pinctrl/mvebu/pinctrl-armada-375.c

@@ -399,7 +399,7 @@ static struct mvebu_mpp_mode mv88f6720_mpp_modes[] = {
 
 static struct mvebu_pinctrl_soc_info armada_375_pinctrl_info;
 
-static struct of_device_id armada_375_pinctrl_of_match[] = {
+static const struct of_device_id armada_375_pinctrl_of_match[] = {
 	{ .compatible = "marvell,mv88f6720-pinctrl" },
 	{ },
 };

+ 1 - 1
drivers/pinctrl/mvebu/pinctrl-armada-38x.c

@@ -389,7 +389,7 @@ static struct mvebu_mpp_mode armada_38x_mpp_modes[] = {
 
 static struct mvebu_pinctrl_soc_info armada_38x_pinctrl_info;
 
-static struct of_device_id armada_38x_pinctrl_of_match[] = {
+static const struct of_device_id armada_38x_pinctrl_of_match[] = {
 	{
 		.compatible = "marvell,mv88f6810-pinctrl",
 		.data       = (void *) V_88F6810,

+ 1 - 1
drivers/pinctrl/mvebu/pinctrl-armada-39x.c

@@ -362,7 +362,7 @@ static struct mvebu_mpp_mode armada_39x_mpp_modes[] = {
 
 static struct mvebu_pinctrl_soc_info armada_39x_pinctrl_info;
 
-static struct of_device_id armada_39x_pinctrl_of_match[] = {
+static const struct of_device_id armada_39x_pinctrl_of_match[] = {
 	{
 		.compatible = "marvell,mv88f6920-pinctrl",
 		.data       = (void *) V_88F6920,

+ 1 - 1
drivers/pinctrl/mvebu/pinctrl-armada-xp.c

@@ -362,7 +362,7 @@ static struct mvebu_mpp_mode armada_xp_mpp_modes[] = {
 
 static struct mvebu_pinctrl_soc_info armada_xp_pinctrl_info;
 
-static struct of_device_id armada_xp_pinctrl_of_match[] = {
+static const struct of_device_id armada_xp_pinctrl_of_match[] = {
 	{
 		.compatible = "marvell,mv78230-pinctrl",
 		.data       = (void *) V_MV78230,

+ 1 - 1
drivers/pinctrl/mvebu/pinctrl-kirkwood.c

@@ -456,7 +456,7 @@ static struct mvebu_pinctrl_soc_info mv98dx4122_info = {
 	.ngpioranges = ARRAY_SIZE(mv88f628x_gpio_ranges),
 };
 
-static struct of_device_id kirkwood_pinctrl_of_match[] = {
+static const struct of_device_id kirkwood_pinctrl_of_match[] = {
 	{ .compatible = "marvell,88f6180-pinctrl", .data = &mv88f6180_info },
 	{ .compatible = "marvell,88f6190-pinctrl", .data = &mv88f6190_info },
 	{ .compatible = "marvell,88f6192-pinctrl", .data = &mv88f6192_info },

+ 1 - 1
drivers/pinctrl/mvebu/pinctrl-orion.c

@@ -211,7 +211,7 @@ static struct mvebu_pinctrl_soc_info mv88f5281_info = {
  * There are multiple variants of the Orion SoCs, but in terms of pin
  * muxing, they are identical.
  */
-static struct of_device_id orion_pinctrl_of_match[] = {
+static const struct of_device_id orion_pinctrl_of_match[] = {
 	{ .compatible = "marvell,88f5181l-pinctrl", .data = &mv88f5181l_info },
 	{ .compatible = "marvell,88f5182-pinctrl", .data = &mv88f5182_info },
 	{ .compatible = "marvell,88f5281-pinctrl", .data = &mv88f5281_info },

+ 1 - 1
drivers/pinctrl/pinctrl-as3722.c

@@ -625,7 +625,7 @@ static int as3722_pinctrl_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static struct of_device_id as3722_pinctrl_of_match[] = {
+static const struct of_device_id as3722_pinctrl_of_match[] = {
 	{ .compatible = "ams,as3722-pinctrl", },
 	{ },
 };

+ 2 - 2
drivers/pinctrl/pinctrl-at91.c

@@ -1114,7 +1114,7 @@ static int at91_pinctrl_parse_functions(struct device_node *np,
 	return 0;
 }
 
-static struct of_device_id at91_pinctrl_of_match[] = {
+static const struct of_device_id at91_pinctrl_of_match[] = {
 	{ .compatible = "atmel,sama5d3-pinctrl", .data = &sama5d3_ops },
 	{ .compatible = "atmel,at91sam9x5-pinctrl", .data = &at91sam9x5_ops },
 	{ .compatible = "atmel,at91rm9200-pinctrl", .data = &at91rm9200_ops },
@@ -1693,7 +1693,7 @@ static struct gpio_chip at91_gpio_template = {
 	.ngpio			= MAX_NB_GPIO_PER_BANK,
 };
 
-static struct of_device_id at91_gpio_of_match[] = {
+static const struct of_device_id at91_gpio_of_match[] = {
 	{ .compatible = "atmel,at91sam9x5-gpio", .data = &at91sam9x5_ops, },
 	{ .compatible = "atmel,at91rm9200-gpio", .data = &at91rm9200_ops },
 	{ /* sentinel */ }

+ 1 - 1
drivers/pinctrl/pinctrl-palmas.c

@@ -987,7 +987,7 @@ static struct palmas_pinctrl_data tps80036_pinctrl_data = {
 	.num_pin_groups = ARRAY_SIZE(tps80036_pingroups),
 };
 
-static struct of_device_id palmas_pinctrl_of_match[] = {
+static const struct of_device_id palmas_pinctrl_of_match[] = {
 	{ .compatible = "ti,palmas-pinctrl", .data = &tps65913_pinctrl_data},
 	{ .compatible = "ti,tps65913-pinctrl", .data = &tps65913_pinctrl_data},
 	{ .compatible = "ti,tps80036-pinctrl", .data = &tps80036_pinctrl_data},

+ 2 - 2
drivers/pinctrl/pinctrl-single.c

@@ -1501,7 +1501,7 @@ static void pcs_free_resources(struct pcs_device *pcs)
 		}							\
 	} while (0);
 
-static struct of_device_id pcs_of_match[];
+static const struct of_device_id pcs_of_match[];
 
 static int pcs_add_gpio_func(struct device_node *node, struct pcs_device *pcs)
 {
@@ -2000,7 +2000,7 @@ static const struct pcs_soc_data pinconf_single = {
 	.flags = PCS_FEAT_PINCONF,
 };
 
-static struct of_device_id pcs_of_match[] = {
+static const struct of_device_id pcs_of_match[] = {
 	{ .compatible = "ti,omap3-padconf", .data = &pinctrl_single_omap_wkup },
 	{ .compatible = "ti,omap4-padconf", .data = &pinctrl_single_omap_wkup },
 	{ .compatible = "ti,omap5-padconf", .data = &pinctrl_single_omap_wkup },

+ 1 - 1
drivers/pinctrl/pinctrl-st.c

@@ -1590,7 +1590,7 @@ static int st_gpiolib_register_bank(struct st_pinctrl *info,
 	return 0;
 }
 
-static struct of_device_id st_pctl_of_match[] = {
+static const struct of_device_id st_pctl_of_match[] = {
 	{ .compatible = "st,stih415-sbc-pinctrl", .data = &stih415_sbc_data },
 	{ .compatible = "st,stih415-rear-pinctrl", .data = &stih415_rear_data },
 	{ .compatible = "st,stih415-left-pinctrl", .data = &stih415_left_data },

+ 1 - 1
drivers/pinctrl/pinctrl-tz1090-pdc.c

@@ -969,7 +969,7 @@ static int tz1090_pdc_pinctrl_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static struct of_device_id tz1090_pdc_pinctrl_of_match[] = {
+static const struct of_device_id tz1090_pdc_pinctrl_of_match[] = {
 	{ .compatible = "img,tz1090-pdc-pinctrl", },
 	{ },
 };

+ 1 - 1
drivers/pinctrl/pinctrl-tz1090.c

@@ -1984,7 +1984,7 @@ static int tz1090_pinctrl_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static struct of_device_id tz1090_pinctrl_of_match[] = {
+static const struct of_device_id tz1090_pinctrl_of_match[] = {
 	{ .compatible = "img,tz1090-pinctrl", },
 	{ },
 };

+ 1 - 1
drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c

@@ -1019,7 +1019,7 @@ static int sun4i_a10_pinctrl_probe(struct platform_device *pdev)
 				  &sun4i_a10_pinctrl_data);
 }
 
-static struct of_device_id sun4i_a10_pinctrl_match[] = {
+static const struct of_device_id sun4i_a10_pinctrl_match[] = {
 	{ .compatible = "allwinner,sun4i-a10-pinctrl", },
 	{}
 };

+ 1 - 1
drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c

@@ -670,7 +670,7 @@ static int sun5i_a10s_pinctrl_probe(struct platform_device *pdev)
 				  &sun5i_a10s_pinctrl_data);
 }
 
-static struct of_device_id sun5i_a10s_pinctrl_match[] = {
+static const struct of_device_id sun5i_a10s_pinctrl_match[] = {
 	{ .compatible = "allwinner,sun5i-a10s-pinctrl", },
 	{}
 };

+ 1 - 1
drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c

@@ -388,7 +388,7 @@ static int sun5i_a13_pinctrl_probe(struct platform_device *pdev)
 				  &sun5i_a13_pinctrl_data);
 }
 
-static struct of_device_id sun5i_a13_pinctrl_match[] = {
+static const struct of_device_id sun5i_a13_pinctrl_match[] = {
 	{ .compatible = "allwinner,sun5i-a13-pinctrl", },
 	{}
 };

+ 1 - 1
drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c

@@ -120,7 +120,7 @@ static int sun6i_a31_r_pinctrl_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static struct of_device_id sun6i_a31_r_pinctrl_match[] = {
+static const struct of_device_id sun6i_a31_r_pinctrl_match[] = {
 	{ .compatible = "allwinner,sun6i-a31-r-pinctrl", },
 	{}
 };

+ 1 - 1
drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c

@@ -922,7 +922,7 @@ static int sun6i_a31_pinctrl_probe(struct platform_device *pdev)
 				  &sun6i_a31_pinctrl_data);
 }
 
-static struct of_device_id sun6i_a31_pinctrl_match[] = {
+static const struct of_device_id sun6i_a31_pinctrl_match[] = {
 	{ .compatible = "allwinner,sun6i-a31-pinctrl", },
 	{}
 };

+ 1 - 1
drivers/pinctrl/sunxi/pinctrl-sun6i-a31s.c

@@ -794,7 +794,7 @@ static int sun6i_a31s_pinctrl_probe(struct platform_device *pdev)
 				  &sun6i_a31s_pinctrl_data);
 }
 
-static struct of_device_id sun6i_a31s_pinctrl_match[] = {
+static const struct of_device_id sun6i_a31s_pinctrl_match[] = {
 	{ .compatible = "allwinner,sun6i-a31s-pinctrl", },
 	{}
 };

+ 1 - 1
drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c

@@ -1045,7 +1045,7 @@ static int sun7i_a20_pinctrl_probe(struct platform_device *pdev)
 				  &sun7i_a20_pinctrl_data);
 }
 
-static struct of_device_id sun7i_a20_pinctrl_match[] = {
+static const struct of_device_id sun7i_a20_pinctrl_match[] = {
 	{ .compatible = "allwinner,sun7i-a20-pinctrl", },
 	{}
 };

+ 1 - 1
drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c

@@ -119,7 +119,7 @@ static int sun8i_a23_r_pinctrl_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static struct of_device_id sun8i_a23_r_pinctrl_match[] = {
+static const struct of_device_id sun8i_a23_r_pinctrl_match[] = {
 	{ .compatible = "allwinner,sun8i-a23-r-pinctrl", },
 	{}
 };

+ 1 - 1
drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c

@@ -571,7 +571,7 @@ static int sun8i_a23_pinctrl_probe(struct platform_device *pdev)
 				  &sun8i_a23_pinctrl_data);
 }
 
-static struct of_device_id sun8i_a23_pinctrl_match[] = {
+static const struct of_device_id sun8i_a23_pinctrl_match[] = {
 	{ .compatible = "allwinner,sun8i-a23-pinctrl", },
 	{}
 };

+ 1 - 1
drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c

@@ -729,7 +729,7 @@ static int sun9i_a80_pinctrl_probe(struct platform_device *pdev)
 				  &sun9i_a80_pinctrl_data);
 }
 
-static struct of_device_id sun9i_a80_pinctrl_match[] = {
+static const struct of_device_id sun9i_a80_pinctrl_match[] = {
 	{ .compatible = "allwinner,sun9i-a80-pinctrl", },
 	{}
 };

+ 1 - 1
drivers/pinctrl/vt8500/pinctrl-vt8500.c

@@ -478,7 +478,7 @@ static int vt8500_pinctrl_remove(struct platform_device *pdev)
 	return wmt_pinctrl_remove(pdev);
 }
 
-static struct of_device_id wmt_pinctrl_of_match[] = {
+static const struct of_device_id wmt_pinctrl_of_match[] = {
 	{ .compatible = "via,vt8500-pinctrl" },
 	{ /* sentinel */ },
 };

+ 1 - 1
drivers/pinctrl/vt8500/pinctrl-wm8505.c

@@ -509,7 +509,7 @@ static int wm8505_pinctrl_remove(struct platform_device *pdev)
 	return wmt_pinctrl_remove(pdev);
 }
 
-static struct of_device_id wmt_pinctrl_of_match[] = {
+static const struct of_device_id wmt_pinctrl_of_match[] = {
 	{ .compatible = "wm,wm8505-pinctrl" },
 	{ /* sentinel */ },
 };

+ 1 - 1
drivers/pinctrl/vt8500/pinctrl-wm8650.c

@@ -347,7 +347,7 @@ static int wm8650_pinctrl_remove(struct platform_device *pdev)
 	return wmt_pinctrl_remove(pdev);
 }
 
-static struct of_device_id wmt_pinctrl_of_match[] = {
+static const struct of_device_id wmt_pinctrl_of_match[] = {
 	{ .compatible = "wm,wm8650-pinctrl" },
 	{ /* sentinel */ },
 };

+ 1 - 1
drivers/pinctrl/vt8500/pinctrl-wm8750.c

@@ -386,7 +386,7 @@ static int wm8750_pinctrl_remove(struct platform_device *pdev)
 	return wmt_pinctrl_remove(pdev);
 }
 
-static struct of_device_id wmt_pinctrl_of_match[] = {
+static const struct of_device_id wmt_pinctrl_of_match[] = {
 	{ .compatible = "wm,wm8750-pinctrl" },
 	{ /* sentinel */ },
 };

+ 1 - 1
drivers/pinctrl/vt8500/pinctrl-wm8850.c

@@ -365,7 +365,7 @@ static int wm8850_pinctrl_remove(struct platform_device *pdev)
 	return wmt_pinctrl_remove(pdev);
 }
 
-static struct of_device_id wmt_pinctrl_of_match[] = {
+static const struct of_device_id wmt_pinctrl_of_match[] = {
 	{ .compatible = "wm,wm8850-pinctrl" },
 	{ /* sentinel */ },
 };