ARM: make of_device_ids const

Uwe Kleine-König · arndb · commit 444d2d33d856 · 2015-02-19T09:44:25.000+01:00
of_device_ids (i.e. compatible strings and the respective data) are not
supposed to change at runtime. All functions working with of_device_ids
provided by &lt;linux/of.h&gt; work with const of_device_ids. So mark the
non-const structs in arch/arm as const, too.

While at it also add some __initconst annotations.

Acked-by: Jason Cooper &lt;jason@lakedameon.net&gt;
Signed-off-by: Uwe Kleine-König &lt;u.kleine-koenig@pengutronix.de&gt;
Signed-off-by: Arnd Bergmann &lt;arnd@arndb.de&gt;
diff --git a/arch/arm/kernel/perf_event_cpu.c b/arch/arm/kernel/perf_event_cpu.c
@@ -231,7 +231,7 @@ static void cpu_pmu_destroy(struct arm_pmu *cpu_pmu)
 /*
  * PMU platform driver and devicetree bindings.
  */
-static struct of_device_id cpu_pmu_of_device_ids[] = {
+static const struct of_device_id cpu_pmu_of_device_ids[] = {
 	{.compatible = "arm,cortex-a17-pmu",	.data = armv7_a17_pmu_init},
 	{.compatible = "arm,cortex-a15-pmu",	.data = armv7_a15_pmu_init},
 	{.compatible = "arm,cortex-a12-pmu",	.data = armv7_a12_pmu_init},
diff --git a/arch/arm/mach-at91/at91rm9200_time.c b/arch/arm/mach-at91/at91rm9200_time.c
@@ -183,7 +183,7 @@ static struct clock_event_device clkevt = {
 void __iomem *at91_st_base;
 EXPORT_SYMBOL_GPL(at91_st_base);
 
-static struct of_device_id at91rm9200_st_timer_ids[] = {
+static const struct of_device_id at91rm9200_st_timer_ids[] = {
 	{ .compatible = "atmel,at91rm9200-st" },
 	{ /* sentinel */ }
 };
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
@@ -226,15 +226,15 @@ void at91_pm_set_standby(void (*at91_standby)(void))
 	}
 }
 
-static struct of_device_id ramc_ids[] = {
+static const struct of_device_id ramc_ids[] __initconst = {
 	{ .compatible = "atmel,at91rm9200-sdramc", .data = at91rm9200_standby },
 	{ .compatible = "atmel,at91sam9260-sdramc", .data = at91sam9_sdram_standby },
 	{ .compatible = "atmel,at91sam9g45-ddramc", .data = at91_ddr_standby },
 	{ .compatible = "atmel,sama5d3-ddramc", .data = at91_ddr_standby },
 	{ /*sentinel*/ }
 };
 
-static void at91_dt_ramc(void)
+static __init void at91_dt_ramc(void)
 {
 	struct device_node *np;
 	const struct of_device_id *of_id;
diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c
@@ -20,7 +20,7 @@
 
 #define DA8XX_NUM_UARTS	3
 
-static struct of_device_id da8xx_irq_match[] __initdata = {
+static const struct of_device_id da8xx_irq_match[] __initconst = {
 	{ .compatible = "ti,cp-intc", .data = cp_intc_of_init, },
 	{ }
 };
diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
@@ -587,7 +587,7 @@ static struct exynos_pm_data exynos5420_pm_data = {
 	.cpu_suspend	= exynos5420_cpu_suspend,
 };
 
-static struct of_device_id exynos_pmu_of_device_ids[] = {
+static const struct of_device_id exynos_pmu_of_device_ids[] __initconst = {
 	{
 		.compatible = "samsung,exynos3250-pmu",
 		.data = &exynos3250_pm_data,
diff --git a/arch/arm/mach-imx/mmdc.c b/arch/arm/mach-imx/mmdc.c
@@ -68,7 +68,7 @@ int imx_mmdc_get_ddr_type(void)
 	return ddr_type;
 }
 
-static struct of_device_id imx_mmdc_dt_ids[] = {
+static const struct of_device_id imx_mmdc_dt_ids[] = {
 	{ .compatible = "fsl,imx6q-mmdc", },
 	{ /* sentinel */ }
 };
diff --git a/arch/arm/mach-keystone/pm_domain.c b/arch/arm/mach-keystone/pm_domain.c
@@ -61,7 +61,7 @@ static struct pm_clk_notifier_block platform_domain_notifier = {
 	.pm_domain = &keystone_pm_domain,
 };
 
-static struct of_device_id of_keystone_table[] = {
+static const struct of_device_id of_keystone_table[] = {
 	{.compatible = "ti,keystone"},
 	{ /* end of list */ },
 };
diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c
@@ -213,7 +213,7 @@ void __init timer_init(int irq)
 }
 
 #ifdef CONFIG_OF
-static struct of_device_id mmp_timer_dt_ids[] = {
+static const struct of_device_id mmp_timer_dt_ids[] = {
 	{ .compatible = "mrvl,mmp-timer", },
 	{}
 };
diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
@@ -51,7 +51,7 @@ enum {
 	COHERENCY_FABRIC_TYPE_ARMADA_380,
 };
 
-static struct of_device_id of_coherency_table[] = {
+static const struct of_device_id of_coherency_table[] = {
 	{.compatible = "marvell,coherency-fabric",
 	 .data = (void *) COHERENCY_FABRIC_TYPE_ARMADA_370_XP },
 	{.compatible = "marvell,armada-375-coherency-fabric",
diff --git a/arch/arm/mach-mvebu/pmsu.c b/arch/arm/mach-mvebu/pmsu.c
@@ -104,7 +104,7 @@ static void __iomem *pmsu_mp_base;
 
 static void *mvebu_cpu_resume;
 
-static struct of_device_id of_pmsu_table[] = {
+static const struct of_device_id of_pmsu_table[] = {
 	{ .compatible = "marvell,armada-370-pmsu", },
 	{ .compatible = "marvell,armada-370-xp-pmsu", },
 	{ .compatible = "marvell,armada-380-pmsu", },
diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c
@@ -242,7 +242,7 @@ static int __init omap4_sar_ram_init(void)
 }
 omap_early_initcall(omap4_sar_ram_init);
 
-static struct of_device_id gic_match[] = {
+static const struct of_device_id gic_match[] = {
 	{ .compatible = "arm,cortex-a9-gic", },
 	{ .compatible = "arm,cortex-a15-gic", },
 	{ },
diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c
@@ -674,7 +674,7 @@ int __init omap3xxx_prm_init(void)
 	return prm_register(&omap3xxx_prm_ll_data);
 }
 
-static struct of_device_id omap3_prm_dt_match_table[] = {
+static const struct of_device_id omap3_prm_dt_match_table[] = {
 	{ .compatible = "ti,omap3-prm" },
 	{ }
 };
diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c
@@ -712,7 +712,7 @@ int __init omap44xx_prm_init(void)
 	return prm_register(&omap44xx_prm_ll_data);
 }
 
-static struct of_device_id omap_prm_dt_match_table[] = {
+static const struct of_device_id omap_prm_dt_match_table[] = {
 	{ .compatible = "ti,omap4-prm" },
 	{ .compatible = "ti,omap5-prm" },
 	{ .compatible = "ti,dra7-prm" },
diff --git a/arch/arm/mach-prima2/platsmp.c b/arch/arm/mach-prima2/platsmp.c
@@ -40,7 +40,7 @@ static void sirfsoc_secondary_init(unsigned int cpu)
 	spin_unlock(&boot_lock);
 }
 
-static struct of_device_id clk_ids[]  = {
+static const struct of_device_id clk_ids[]  = {
 	{ .compatible = "sirf,atlas7-clkc" },
 	{},
 };
diff --git a/arch/arm/mach-ux500/pm_domains.c b/arch/arm/mach-ux500/pm_domains.c
@@ -49,7 +49,7 @@ static struct generic_pm_domain *ux500_pm_domains[NR_DOMAINS] = {
 	[DOMAIN_VAPE] = &ux500_pm_domain_vape,
 };
 
-static struct of_device_id ux500_pm_domain_matches[] = {
+static const struct of_device_id ux500_pm_domain_matches[] __initconst = {
 	{ .compatible = "stericsson,ux500-pm-domains", },
 	{ },
 };

Original file line number	Diff line number	Diff line change
`@@ -226,15 +226,15 @@ void at91_pm_set_standby(void (*at91_standby)(void))`
`226`	`226`	`}`
`227`	`227`	`}`
`228`	`228`
`229`		`-static struct of_device_id ramc_ids[] = {`
	`229`	`+static const struct of_device_id ramc_ids[] __initconst = {`
`230`	`230`	`{ .compatible = "atmel,at91rm9200-sdramc", .data = at91rm9200_standby },`
`231`	`231`	`{ .compatible = "atmel,at91sam9260-sdramc", .data = at91sam9_sdram_standby },`
`232`	`232`	`{ .compatible = "atmel,at91sam9g45-ddramc", .data = at91_ddr_standby },`
`233`	`233`	`{ .compatible = "atmel,sama5d3-ddramc", .data = at91_ddr_standby },`
`234`	`234`	`{ /sentinel/ }`
`235`	`235`	`};`
`236`	`236`
`237`		`-static void at91_dt_ramc(void)`
	`237`	`+static __init void at91_dt_ramc(void)`
`238`	`238`	`{`
`239`	`239`	`struct device_node *np;`
`240`	`240`	`const struct of_device_id *of_id;`
Original file line number	Diff line number	Diff line change
`@@ -587,7 +587,7 @@ static struct exynos_pm_data exynos5420_pm_data = {`
`587`	`587`	`.cpu_suspend = exynos5420_cpu_suspend,`
`588`	`588`	`};`
`589`	`589`
`590`		`-static struct of_device_id exynos_pmu_of_device_ids[] = {`
	`590`	`+static const struct of_device_id exynos_pmu_of_device_ids[] __initconst = {`
`591`	`591`	`{`
`592`	`592`	`.compatible = "samsung,exynos3250-pmu",`
`593`	`593`	`.data = &exynos3250_pm_data,`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ int imx_mmdc_get_ddr_type(void)`
`68`	`68`	`return ddr_type;`
`69`	`69`	`}`
`70`	`70`
`71`		`-static struct of_device_id imx_mmdc_dt_ids[] = {`
	`71`	`+static const struct of_device_id imx_mmdc_dt_ids[] = {`
`72`	`72`	`{ .compatible = "fsl,imx6q-mmdc", },`
`73`	`73`	`{ /* sentinel */ }`
`74`	`74`	`};`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ void __init timer_init(int irq)`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`#ifdef CONFIG_OF`
`216`		`-static struct of_device_id mmp_timer_dt_ids[] = {`
	`216`	`+static const struct of_device_id mmp_timer_dt_ids[] = {`
`217`	`217`	`{ .compatible = "mrvl,mmp-timer", },`
`218`	`218`	`{}`
`219`	`219`	`};`
Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ static int __init omap4_sar_ram_init(void)`
`242`	`242`	`}`
`243`	`243`	`omap_early_initcall(omap4_sar_ram_init);`
`244`	`244`
`245`		`-static struct of_device_id gic_match[] = {`
	`245`	`+static const struct of_device_id gic_match[] = {`
`246`	`246`	`{ .compatible = "arm,cortex-a9-gic", },`
`247`	`247`	`{ .compatible = "arm,cortex-a15-gic", },`
`248`	`248`	`{ },`
Original file line number	Diff line number	Diff line change
`@@ -674,7 +674,7 @@ int __init omap3xxx_prm_init(void)`
`674`	`674`	`return prm_register(&omap3xxx_prm_ll_data);`
`675`	`675`	`}`
`676`	`676`
`677`		`-static struct of_device_id omap3_prm_dt_match_table[] = {`
	`677`	`+static const struct of_device_id omap3_prm_dt_match_table[] = {`
`678`	`678`	`{ .compatible = "ti,omap3-prm" },`
`679`	`679`	`{ }`
`680`	`680`	`};`
Original file line number	Diff line number	Diff line change
`@@ -712,7 +712,7 @@ int __init omap44xx_prm_init(void)`
`712`	`712`	`return prm_register(&omap44xx_prm_ll_data);`
`713`	`713`	`}`
`714`	`714`
`715`		`-static struct of_device_id omap_prm_dt_match_table[] = {`
	`715`	`+static const struct of_device_id omap_prm_dt_match_table[] = {`
`716`	`716`	`{ .compatible = "ti,omap4-prm" },`
`717`	`717`	`{ .compatible = "ti,omap5-prm" },`
`718`	`718`	`{ .compatible = "ti,dra7-prm" },`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ static void sirfsoc_secondary_init(unsigned int cpu)`
`40`	`40`	`spin_unlock(&boot_lock);`
`41`	`41`	`}`
`42`	`42`
`43`		`-static struct of_device_id clk_ids[] = {`
	`43`	`+static const struct of_device_id clk_ids[] = {`
`44`	`44`	`{ .compatible = "sirf,atlas7-clkc" },`
`45`	`45`	`{},`
`46`	`46`	`};`