ARM+ARM64: constify of_device_ids
Subsystems (17)
cover ARM+ARM64: constify of_device_ids
Hello,
most of_device_ids can (and should) be const as the driver core cannot handle changes to compatible strings. So I checked all non-const of_device_ids and they can all be marked as const, for omap2 after some function parameters get a const annotation, too.
I split of the changes to mach-omap2 because there (as noted above) some functions need a change there, too.
Should I split further by platform? Who is willing to take these patches?
Best regards
Uwe
Uwe Kleine-K?nig (3):
ARM: OMAP2+: make of_device_ids const
ARM: make of_device_ids const
ARM64: make of_device_ids const
arch/arm/kernel/perf_event_cpu.c | 2 +- arch/arm/mach-at91/at91rm9200_time.c | 2 +- arch/arm/mach-at91/at91sam9263_devices.c | 2 +- arch/arm/mach-at91/at91sam926x_time.c | 2 +- arch/arm/mach-at91/clock.c | 4 ++-- arch/arm/mach-at91/setup.c | 6 +++--- arch/arm/mach-davinci/da8xx-dt.c | 2 +- arch/arm/mach-imx/mmdc.c | 2 +- arch/arm/mach-keystone/pm_domain.c | 2 +- arch/arm/mach-mmp/time.c | 2 +- arch/arm/mach-mvebu/coherency.c | 2 +- arch/arm/mach-mvebu/pmsu.c | 2 +- arch/arm/mach-omap2/board-generic.c | 2 +- arch/arm/mach-omap2/common.h | 2 +- arch/arm/mach-omap2/gpmc.c | 2 +- arch/arm/mach-omap2/irq.c | 2 +- arch/arm/mach-omap2/pdata-quirks.c | 2 +- arch/arm/mach-omap2/prm_common.c | 2 +- arch/arm/mach-omap2/timer.c | 6 +++--- arch/arm/mach-prima2/platsmp.c | 2 +- arch/arm/mach-sunxi/sunxi.c | 2 +- arch/arm64/kernel/perf_event.c | 2 +- 22 files changed, 27 insertions(+), 27 deletions(-)
Signature · 1 line
2.1.0
PATCH 1/3 ARM: OMAP2+: make of_device_ids const
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 <linux/of.h> work with const of_device_ids. So mark the non-const function parameters and structs for OMAP2+ as const, too.
--- arch/arm/mach-omap2/board-generic.c | 2 +- arch/arm/mach-omap2/common.h | 2 +- arch/arm/mach-omap2/gpmc.c | 2 +- arch/arm/mach-omap2/irq.c | 2 +- arch/arm/mach-omap2/pdata-quirks.c | 2 +- arch/arm/mach-omap2/prm_common.c | 2 +- arch/arm/mach-omap2/timer.c | 6 +++--- 7 files changed, 9 insertions(+), 9 deletions(-)
arch/arm/mach-omap2/board-generic.c +1 -1
@@ -27,7 +27,7 @@#define gic_of_init NULL#endif -static struct of_device_id omap_dt_match_table[]__initdata = { +static const struct of_device_id omap_dt_match_table[]__initconst = { { .compatible ="simple-bus" , }, { .compatible ="ti,omap-infra" , }, { }
arch/arm/mach-omap2/common.h +1 -1
@@ -307,7 +307,7 @@ static inline void omap4_cpu_resume(void)#endif -void pdata_quirks_init (struct of_device_id *); +void pdata_quirks_init (const struct of_device_id *);void omap_auxdata_legacy_init (struct device *dev);void omap_pcs_legacy_init (int irq,void (*rearm)(void ));
arch/arm/mach-omap2/gpmc.c +1 -1
@@ -1243,7 +1243,7 @@ int gpmc_cs_program_settings(int cs, struct gpmc_settings *p) }#ifdef CONFIG_OF -static struct of_device_id gpmc_dt_ids[] = { +static const struct of_device_id gpmc_dt_ids[] = { { .compatible ="ti,omap2420-gpmc" }, { .compatible ="ti,omap2430-gpmc" }, { .compatible = "ti,omap3430-gpmc" }, /* omap3430 & omap3630 */
arch/arm/mach-omap2/irq.c +1 -1
@@ -289,7 +289,7 @@ int __init intc_of_init(struct device_node *node,return 0 ; } -static struct of_device_id irq_match[]__initdata = { +static const struct of_device_id irq_match[]__initconst = { { .compatible ="ti,omap2-intc" , .data = intc_of_init, }, { } };
arch/arm/mach-omap2/pdata-quirks.c +1 -1
@@ -405,7 +405,7 @@ static void pdata_quirks_check(struct pdata_init *quirks) } } -void __init pdata_quirks_init (struct of_device_id *omap_dt_match_table) +void __init pdata_quirks_init (const struct of_device_id *omap_dt_match_table) {omap_sdrc_init (NULL ,NULL );pdata_quirks_check (auxdata_quirks);
arch/arm/mach-omap2/prm_common.c +1 -1
@@ -467,7 +467,7 @@ int prm_unregister(struct prm_ll_data *pld)return 0 ; } -static struct of_device_id omap_prcm_dt_match_table[] = { +static const struct of_device_id omap_prcm_dt_match_table[] = { { .compatible ="ti,am3-prcm" }, { .compatible ="ti,am3-scrm" }, { .compatible ="ti,am4-prcm" },
arch/arm/mach-omap2/timer.c +3 -3
@@ -141,7 +141,7 @@ static struct property device_disabled = { .value = "disabled", }; -static struct of_device_id omap_timer_match[]__initdata = { +static const struct of_device_id omap_timer_match[]__initconst = { { .compatible ="ti,omap2420-timer" , }, { .compatible ="ti,omap3430-timer" , }, { .compatible ="ti,omap4430-timer" , },
@@ -162,7 +162,7 @@ static struct of_device_id omap_timer_match[] __initdata = {* the timer node in device-tree as disabled, to prevent the kernel from * registering this timer as a platform device and so no one else can use it. */ -static struct device_node *__init omap_get_timer_dt (struct of_device_id *match, +static struct device_node *__init omap_get_timer_dt (const struct of_device_id *match,const char *property) {struct device_node *np;
@@ -388,7 +388,7 @@ static u64 notrace dmtimer_read_sched_clock(void)return 0 ; } -static struct of_device_id omap_counter_match[]__initdata = { +static const struct of_device_id omap_counter_match[]__initconst = { { .compatible ="ti,omap-counter32k" , }, { } };
Signature · 1 line
2.1.0
Tony Lindgren
maintainerPATCH 1/3 ARM: OMAP2+: make of_device_ids const
Quoted 4 lines · Uwe Kleine-K?nig
of_device_ids(i.e. compatible strings and the respective data) are not supposed to change at runtime. All functions working withof_device_idsprovided by <linux/of.h> work with constof_device_ids. So mark the non-const function parameters and structs for OMAP2+ as const, too.
Hmm this does not seem to compile with omap2plus_defconfig because of section type conflicts. Looks like there's some issue now with the use of __initconst:
arch/arm/mach-omap2/board-generic.c:262:20: error: dra72x_boards_compat causes a section type conflict with omap_dt_match_table arch/arm/mach-omap2/board-generic.c:30:34: note: ?omap_dt_match_table? was declared here scripts/Makefile.build:257: recipe for target 'arch/arm/mach-omap2/board-generic.o' failed
Regards,
Tony
PATCH 1/3 ARM: OMAP2+: make of_device_ids const
Quoted 6 lines · Tony Lindgren
Quoted 4 lines · Uwe Kleine-K?nig
of_device_ids(i.e. compatible strings and the respective data) are not supposed to change at runtime. All functions working withof_device_idsprovided by <linux/of.h> work with constof_device_ids. So mark the non-const function parameters and structs for OMAP2+ as const, too.
Quoted 7 lines
Hmm this does not seem to compile with
omap2plus_defconfigbecause of section type conflicts. Looks like there's some issue now with the use of__initconst:
arch/arm/mach-omap2/board-generic.c:262:20: error:dra72x_boards_compatcauses a section type conflict withomap_dt_match_tablearch/arm/mach-omap2/board-generic.c:30:34: note: ?omap_dt_match_table? was declared herescripts/Makefile.build:257: recipe for target 'arch/arm/mach-omap2/board-generic.o' failed
The problem is dra74x_boards_compat though:
static const char *dra74x_boards_compat[] __initconst = {
...*dra74x_boards_compat is const, but dra74x_boards_compat isn't, so either the variable must go into __initdata or it must be declared as:
static const char * const dra74x_boards_compat[] __initconst = {
...(but then I guess you get another warning because struct machine_desc's dt_compat is declared as
const char **dt_compat;
.)
With the patch below, arch/arm/mach-omap2/board-generic.c compiles just fine. Don't know yet if the additional const in <asm/mach_desc.h> is problematic ...
arch/arc/include/asm/mach_desc.h +1 -1
@@ -35,7 +35,7 @@*/ struct machine_desc {const char *name; -const char **dt_compat; +const char *const *dt_compat;void (*init_early)(void );void (*init_irq)(void );
arch/arm/mach-omap2/board-generic.c +12 -12
@@ -43,7 +43,7 @@ static void __init omap_generic_init(void) }#ifdef CONFIG_SOC_OMAP2420 -static const char *omap242x_boards_compat[]__initconst = { +static const char *const omap242x_boards_compat[]__initconst = {"ti,omap2420" ,NULL , };
@@ -62,7 +62,7 @@ MACHINE_END#endif #ifdef CONFIG_SOC_OMAP2430 -static const char *omap243x_boards_compat[]__initconst = { +static const char *const omap243x_boards_compat[]__initconst = {"ti,omap2430" ,NULL , };
@@ -81,7 +81,7 @@ MACHINE_END#endif #ifdef CONFIG_ARCH_OMAP3 -static const char *omap3_boards_compat[]__initconst = { +static const char *const omap3_boards_compat[]__initconst = {"ti,omap3430" ,"ti,omap3" , NULL,
@@ -100,7 +100,7 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)") .restart = omap3xxx_restart,MACHINE_END -static const char *omap36xx_boards_compat[] __initconst = { +static const char *const omap36xx_boards_compat[] __initconst = {"ti,omap36xx" ,NULL , };
@@ -118,7 +118,7 @@ DT_MACHINE_START(OMAP36XX_DT, "Generic OMAP36xx (Flattened Device Tree)") .restart = omap3xxx_restart,MACHINE_END -static const char *omap3_gp_boards_compat[] __initconst = { +static const char *const omap3_gp_boards_compat[] __initconst = {"ti,omap3-beagle" ,"timll,omap3-devkit8000" ,NULL ,
@@ -137,7 +137,7 @@ DT_MACHINE_START(OMAP3_GP_DT, "Generic OMAP3-GP (Flattened Device Tree)") .restart = omap3xxx_restart,MACHINE_END -static const char *am3517_boards_compat[] __initconst = { +static const char *const am3517_boards_compat[] __initconst = {"ti,am3517" ,NULL , };
@@ -157,7 +157,7 @@ MACHINE_END#endif #ifdef CONFIG_SOC_AM33XX -static const char *am33xx_boards_compat[]__initconst = { +static const char *const am33xx_boards_compat[]__initconst = {"ti,am33xx" ,NULL , };
@@ -177,7 +177,7 @@ MACHINE_END#endif #ifdef CONFIG_ARCH_OMAP4 -static const char *omap4_boards_compat[]__initconst = { +static const char *const omap4_boards_compat[]__initconst = {"ti,omap4460" ,"ti,omap4430" , "ti,omap4",
@@ -199,7 +199,7 @@ MACHINE_END#endif #ifdef CONFIG_SOC_OMAP5 -static const char *omap5_boards_compat[]__initconst = { +static const char *const omap5_boards_compat[]__initconst = {"ti,omap5432" ,"ti,omap5430" , "ti,omap5",
@@ -221,7 +221,7 @@ MACHINE_END#endif #ifdef CONFIG_SOC_AM43XX -static const char *am43_boards_compat[]__initconst = { +static const char *const am43_boards_compat[]__initconst = {"ti,am4372" ,"ti,am43" , NULL,
@@ -240,7 +240,7 @@ MACHINE_END#endif #ifdef CONFIG_SOC_DRA7XX -static const char *dra74x_boards_compat[]__initconst = { +static const char *const dra74x_boards_compat[]__initconst = {"ti,dra742" ,"ti,dra7" , NULL,
@@ -259,7 +259,7 @@ DT_MACHINE_START(DRA74X_DT, "Generic DRA74X (Flattened Device Tree)") .restart = omap44xx_restart,MACHINE_END -static const char *dra72x_boards_compat[] __initconst = { +static const char *const dra72x_boards_compat[] __initconst = {"ti,dra722" ,NULL , };
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
Tony Lindgren
maintainerPATCH 1/3 ARM: OMAP2+: make of_device_ids const
Quoted 16 lines · Uwe Kleine-K?nig
Quoted 6 lines · Tony Lindgren
Quoted 4 lines · Uwe Kleine-K?nig
of_device_ids(i.e. compatible strings and the respective data) are not supposed to change at runtime. All functions working withof_device_idsprovided by <linux/of.h> work with constof_device_ids. So mark the non-const function parameters and structs for OMAP2+ as const, too.Quoted 7 lines
Hmm this does not seem to compile with
omap2plus_defconfigbecause of section type conflicts. Looks like there's some issue now with the use of__initconst:
arch/arm/mach-omap2/board-generic.c:262:20: error:dra72x_boards_compatcauses a section type conflict withomap_dt_match_tablearch/arm/mach-omap2/board-generic.c:30:34: note: ?omap_dt_match_table? was declared herescripts/Makefile.build:257: recipe for target 'arch/arm/mach-omap2/board-generic.o' failedThe problem is
dra74x_boards_compatthough:
Quoted 8 lines
static const char *dra74x_boards_compat[] __initconst = { ...
*dra74x_boards_compatis const, butdra74x_boards_compatisn't, so either the variable must go into__initdataor it must be declared as:static const char * const dra74x_boards_compat[] __initconst = { ...
Ah OK.
Quoted 10 lines
(but then I guess you get another warning because struct machine_desc's
dt_compatis declared asconst char **dt_compat;.)
With the patch below,
arch/arm/mach-omap2/board-generic.ccompiles just fine. Don't know yet if the additional const in <asm/mach_desc.h> is problematic ...
Yes OK thanks. It Would be nice to have those as __initconst to discard the unused ones.
Regards,
Tony
PATCH 1/3 ARM: OMAP2+: make of_device_ids const
Hello Tony,
Quoted 33 lines · Tony Lindgren
Quoted 16 lines · Uwe Kleine-K?nig
Quoted 6 lines · Tony Lindgren
Quoted 4 lines · Uwe Kleine-K?nig
of_device_ids(i.e. compatible strings and the respective data) are not supposed to change at runtime. All functions working withof_device_idsprovided by <linux/of.h> work with constof_device_ids. So mark the non-const function parameters and structs for OMAP2+ as const, too.Quoted 7 lines
Hmm this does not seem to compile with
omap2plus_defconfigbecause of section type conflicts. Looks like there's some issue now with the use of__initconst:
arch/arm/mach-omap2/board-generic.c:262:20: error:dra72x_boards_compatcauses a section type conflict withomap_dt_match_tablearch/arm/mach-omap2/board-generic.c:30:34: note: ?omap_dt_match_table? was declared herescripts/Makefile.build:257: recipe for target 'arch/arm/mach-omap2/board-generic.o' failedThe problem is
dra74x_boards_compatthough:Quoted 8 lines
static const char *dra74x_boards_compat[] __initconst = { ...
*dra74x_boards_compatis const, butdra74x_boards_compatisn't, so either the variable must go into__initdataor it must be declared as:static const char * const dra74x_boards_compat[] __initconst = { ...Ah OK.
Quoted 5 lines
(but then I guess you get another warning because struct machine_desc's
dt_compatis declared asconst char **dt_compat;
Quoted 8 lines
Quoted 5 lines
.)
With the patch below,
arch/arm/mach-omap2/board-generic.ccompiles just fine. Don't know yet if the additional const in <asm/mach_desc.h> is problematic ...Yes OK thanks. It Would be nice to have those as
__initconstto discard the unused ones.
__initdata is discarded, too, but I already send a patch that adds the additional consts. On top of this one the patch from this thread is fine.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
Tony Lindgren
maintainerPATCH 1/3 ARM: OMAP2+: make of_device_ids const
Quoted 42 lines · Uwe Kleine-K?nig
Hello Tony,
Quoted 39 lines · Tony Lindgren
Quoted 16 lines · Uwe Kleine-K?nig
Quoted 6 lines · Tony Lindgren
Quoted 4 lines · Uwe Kleine-K?nig
of_device_ids(i.e. compatible strings and the respective data) are not supposed to change at runtime. All functions working withof_device_idsprovided by <linux/of.h> work with constof_device_ids. So mark the non-const function parameters and structs for OMAP2+ as const, too.Quoted 7 lines
Hmm this does not seem to compile with
omap2plus_defconfigbecause of section type conflicts. Looks like there's some issue now with the use of__initconst:
arch/arm/mach-omap2/board-generic.c:262:20: error:dra72x_boards_compatcauses a section type conflict withomap_dt_match_tablearch/arm/mach-omap2/board-generic.c:30:34: note: ?omap_dt_match_table? was declared herescripts/Makefile.build:257: recipe for target 'arch/arm/mach-omap2/board-generic.o' failedThe problem is
dra74x_boards_compatthough:Quoted 8 lines
static const char *dra74x_boards_compat[] __initconst = { ...
*dra74x_boards_compatis const, butdra74x_boards_compatisn't, so either the variable must go into__initdataor it must be declared as:static const char * const dra74x_boards_compat[] __initconst = { ...Ah OK.
Quoted 10 lines
(but then I guess you get another warning because struct machine_desc's
dt_compatis declared asconst char **dt_compat;.)
With the patch below,
arch/arm/mach-omap2/board-generic.ccompiles just fine. Don't know yet if the additional const in <asm/mach_desc.h> is problematic ...
Quoted 5 lines
Quoted 2 lines
Yes OK thanks. It Would be nice to have those as
__initconstto discard the unused ones.
__initdatais discarded, too, but I already send a patch that adds the additional consts. On top of this one the patch from this thread is fine.
OK great thanks. I'll apply both into omap-for-v3.18/fixes-not-urgent.
Regards,
Tony
PATCH 1/3 ARM: OMAP2+: make of_device_ids const
Hello Tony,
Quoted 1 line · Tony Lindgren
OK great thanks. I'll apply both into omap-for-v3.18/fixes-not-urgent.
I would have put "make of_device_ids const" into cleanups, but that's up to you.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
Tony Lindgren
maintainerPATCH 1/3 ARM: OMAP2+: make of_device_ids const
Quoted 6 lines · Uwe Kleine-K?nig
Hello Tony,
Quoted 1 line · Tony Lindgren
OK great thanks. I'll apply both into omap-for-v3.18/fixes-not-urgent.
I would have put "make
of_device_idsconst" into cleanups, but that's up to you.
Yes that would have worked too but already applied and building randconfigs :)
Tony
PATCH 1/3 ARM: OMAP2+: make of_device_ids const
In reply to Uwe Kleine-KönigHello,
arch/arc/include/asm/mach_desc.h
Quoted 40 lines · Uwe Kleine-K?nig
Quoted 6 lines · Tony Lindgren
Quoted 4 lines · Uwe Kleine-K?nig
of_device_ids(i.e. compatible strings and the respective data) are not supposed to change at runtime. All functions working withof_device_idsprovided by <linux/of.h> work with constof_device_ids. So mark the non-const function parameters and structs for OMAP2+ as const, too.Quoted 7 lines
Hmm this does not seem to compile with
omap2plus_defconfigbecause of section type conflicts. Looks like there's some issue now with the use of__initconst:
arch/arm/mach-omap2/board-generic.c:262:20: error:dra72x_boards_compatcauses a section type conflict withomap_dt_match_tablearch/arm/mach-omap2/board-generic.c:30:34: note: ?omap_dt_match_table? was declared herescripts/Makefile.build:257: recipe for target 'arch/arm/mach-omap2/board-generic.o' failedThe problem is
dra74x_boards_compatthough:static const char *dra74x_boards_compat[] __initconst = { ...
*dra74x_boards_compatis const, butdra74x_boards_compatisn't, so either the variable must go into__initdataor it must be declared as:static const char * const dra74x_boards_compat[] __initconst = { ...(but then I guess you get another warning because struct machine_desc's
dt_compatis declared asconst char **dt_compat;.)
With the patch below,
arch/arm/mach-omap2/board-generic.ccompiles just fine. Don't know yet if the additional const in <asm/mach_desc.h> is problematic ...arch/arc/include/asm/mach_desc.h +0
-0
this is obviously non-sense. The definition for arm already has the const I added here for arc.
So the patch for board-generic.c below is fine. I will create a proper patch for it.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH 2/3 ARM: make of_device_ids const
In reply to Uwe Kleine-Königof_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 <linux/of.h> work with const of_device_ids. So mark the non-const structs in arch/arm as const, too.
--- arch/arm/kernel/perf_event_cpu.c | 2 +- arch/arm/mach-at91/at91rm9200_time.c | 2 +- arch/arm/mach-at91/at91sam9263_devices.c | 2 +- arch/arm/mach-at91/at91sam926x_time.c | 2 +- arch/arm/mach-at91/clock.c | 4 ++-- arch/arm/mach-at91/setup.c | 6 +++--- arch/arm/mach-davinci/da8xx-dt.c | 2 +- arch/arm/mach-imx/mmdc.c | 2 +- arch/arm/mach-keystone/pm_domain.c | 2 +- arch/arm/mach-mmp/time.c | 2 +- arch/arm/mach-mvebu/coherency.c | 2 +- arch/arm/mach-mvebu/pmsu.c | 2 +- arch/arm/mach-prima2/platsmp.c | 2 +- arch/arm/mach-sunxi/sunxi.c | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-)
arch/arm/kernel/perf_event_cpu.c +1 -1
@@ -224,7 +224,7 @@ static struct notifier_block cpu_pmu_hotplug_notifier = {/* * 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},
arch/arm/mach-at91/at91rm9200_time.c +1 -1
@@ -184,7 +184,7 @@ void __iomem *at91_st_base;EXPORT_SYMBOL_GPL (at91_st_base);#ifdef CONFIG_OF -static struct of_device_id at91rm9200_st_timer_ids[] = { +static const struct of_device_id at91rm9200_st_timer_ids[] = { { .compatible ="atmel,at91rm9200-st" }, {/* sentinel */ } };
arch/arm/mach-at91/at91sam9263_devices.c +1 -1
@@ -981,7 +981,7 @@ static struct platform_device at91sam9263_tcb_device = { };#if defined(CONFIG_OF ) -static struct of_device_id tcb_ids[] = { +static const struct of_device_id tcb_ids[] = { { .compatible ="atmel,at91rm9200-tcb" }, {/*sentinel*/ } };
arch/arm/mach-at91/at91sam926x_time.c +1 -1
@@ -179,7 +179,7 @@ static struct irqaction at91sam926x_pit_irq = { };#ifdef CONFIG_OF -static struct of_device_id pit_timer_ids[] = { +static const struct of_device_id pit_timer_ids[] = { { .compatible ="atmel,at91sam9260-pit" }, {/* sentinel */ } };
arch/arm/mach-at91/clock.c +2 -2
@@ -876,7 +876,7 @@ static int __init at91_pmc_init(unsigned long main_clock) }#if defined(CONFIG_OF ) -static struct of_device_id pmc_ids[] = { +static const struct of_device_id pmc_ids[] = { { .compatible ="atmel,at91rm9200-pmc" }, { .compatible ="atmel,at91sam9260-pmc" }, { .compatible = "atmel,at91sam9g45-pmc" },
@@ -886,7 +886,7 @@ static struct of_device_id pmc_ids[] = { {/*sentinel*/ } }; -static struct of_device_id osc_ids[] = { +static const struct of_device_id osc_ids[] = { { .compatible ="atmel,osc" }, {/*sentinel*/ } };
arch/arm/mach-at91/setup.c +3 -3
@@ -352,7 +352,7 @@ void __init at91_ioremap_matrix(u32 base_addr) }#if defined(CONFIG_OF ) && !defined(CONFIG_ARCH_AT91X40 ) -static struct of_device_id rstc_ids[] = { +static const struct of_device_id rstc_ids[] = { { .compatible ="atmel,at91sam9260-rstc" , .data = at91sam9_alt_restart }, { .compatible ="atmel,at91sam9g45-rstc" , .data = at91sam9g45_restart }, { /*sentinel*/ }
@@ -380,7 +380,7 @@ static void at91_dt_rstc(void)of_node_put (np); } -static struct of_device_id ramc_ids[] = { +static const struct of_device_id ramc_ids[] = { { .compatible ="atmel,at91rm9200-sdramc" , .data = at91rm9200_standby }, { .compatible ="atmel,at91sam9260-sdramc" , .data = at91sam9_sdram_standby }, { .compatible ="atmel,at91sam9g45-ddramc" , .data = at91_ddr_standby },
@@ -411,7 +411,7 @@ static void at91_dt_ramc(void)of_node_put (np); } -static struct of_device_id shdwc_ids[] = { +static const struct of_device_id shdwc_ids[] = { { .compatible ="atmel,at91sam9260-shdwc" , }, { .compatible ="atmel,at91sam9rl-shdwc" , }, { .compatible ="atmel,at91sam9x5-shdwc" , },
arch/arm/mach-davinci/da8xx-dt.c +1 -1
@@ -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, }, { } };
arch/arm/mach-imx/mmdc.c +1 -1
@@ -51,7 +51,7 @@ static int imx_mmdc_probe(struct platform_device *pdev)return 0 ; } -static struct of_device_id imx_mmdc_dt_ids[] = { +static const struct of_device_id imx_mmdc_dt_ids[] = { { .compatible ="fsl,imx6q-mmdc" , }, {/* sentinel */ } };
arch/arm/mach-keystone/pm_domain.c +1 -1
@@ -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 */ }, };
arch/arm/mach-mmp/time.c +1 -1
@@ -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" , }, {} };
arch/arm/mach-mvebu/coherency.c +1 -1
@@ -53,7 +53,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" ,
arch/arm/mach-mvebu/pmsu.c +1 -1
@@ -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" , },
arch/arm/mach-prima2/platsmp.c +1 -1
@@ -60,7 +60,7 @@ static void sirfsoc_secondary_init(unsigned int cpu)spin_unlock (&boot_lock); } -static struct of_device_id rsc_ids[] = { +static const struct of_device_id rsc_ids[] = { { .compatible ="sirf,marco-rsc" }, {}, };
arch/arm/mach-sunxi/sunxi.c +1 -1
@@ -64,7 +64,7 @@ static void sun4i_restart(enum reboot_mode mode, const char *cmd) } } -static struct of_device_id sunxi_restart_ids[] = { +static const struct of_device_id sunxi_restart_ids[] = { { .compatible ="allwinner,sun4i-a10-wdt" }, {/*sentinel*/ } };
Signature · 1 line
2.1.0
PATCH 2/3 ARM: make of_device_ids const
Uwe,
Quoted 7 lines · Uwe Kleine-K?nig
of_device_ids(i.e. compatible strings and the respective data) are not supposed to change at runtime. All functions working withof_device_idsprovided by <linux/of.h> work with constof_device_ids. So mark the non-const structs inarch/armas const, too.Signed-off-by Uwe Kleine-K?nig <[email protected]>---
...
Quoted 2 lines
arch/arm/mach-mvebu/coherency.c | 2 +- arch/arm/mach-mvebu/pmsu.c | 2 +-
For the mvebu stuff,
thx,
Jason.
PATCH 3/3 ARM64: make of_device_ids const
In reply to Uwe Kleine-Königof_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 <linux/of.h> work with const of_device_ids. So mark the only non-const struct in arch/arm64 as const, too.
--- arch/arm64/kernel/perf_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/kernel/perf_event.c +1 -1
@@ -1276,7 +1276,7 @@ arch_initcall(cpu_pmu_reset);/* * PMU platform driver and devicetree bindings. */ -static struct of_device_id armpmu_of_device_ids[] = { +static const struct of_device_id armpmu_of_device_ids[] = { {.compatible ="arm,armv8-pmuv3" }, {}, };
Signature · 1 line
2.1.0
Catalin Marinas
maintainerPATCH 3/3 ARM64: make of_device_ids const
Quoted 15 lines · Uwe Kleine-K?nig
of_device_ids(i.e. compatible strings and the respective data) are not supposed to change at runtime. All functions working withof_device_idsprovided by <linux/of.h> work with constof_device_ids. So mark the only non-const struct inarch/arm64as const, too.Signed-off-by Uwe Kleine-K?nig <[email protected]>--- arch/arm64/kernel/perf_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm64/kernel/perf_event.c +0
-0
arch/arm64/kernel/perf_event.c arch_initcall(cpu_pmu_reset); · line 1282
Quoted 8 lines
arch/arm64/kernel/perf_event.c +1
-1@@ -1276,7 +1276,7 @@ arch_initcall(cpu_pmu_reset);/* * PMU platform driver and devicetree bindings. */ -static struct of_device_id armpmu_of_device_ids[] = { +static const struct of_device_id armpmu_of_device_ids[] = { {.compatible ="arm,armv8-pmuv3" }, {}, };
(I guess you could upstream the patches via the arm-soc tree)