[PATCH 1/3] ARM: OMAP2+: make of_device_ids const
From: Uwe Kleine-König <hidden>
Date: 2014-09-11 19:14:57
Also in:
linux-devicetree, linux-omap
Hello, On Thu, Sep 11, 2014 at 09:01:36PM +0200, Uwe Kleine-K?nig wrote:
quoted hunk
On Thu, Sep 11, 2014 at 10:39:43AM -0700, Tony Lindgren wrote:quoted
* Uwe Kleine-K?nig [off-list ref] [140910 01:27]:quoted
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.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' failedThe 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 ...diff --git a/arch/arc/include/asm/mach_desc.h b/arch/arc/include/asm/mach_desc.h index e8993a2be6c2..f4a7bc8d8967 100644 --- a/arch/arc/include/asm/mach_desc.h +++ b/arch/arc/include/asm/mach_desc.h
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 -- Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |