Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 543c5040 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Arnd Bergmann
Browse files

ARM: make arrays containing machine compatible strings const 



The definition

	static const char *axxia_dt_match[] __initconst = {
		...

defines a changable array of constant strings. That is you must not do:

	*axxia_dt_match[0] = 'k';

but

	axxia_dt_match[0] = "different string";

is fine. So the annotation __initconst is wrong and yields a compiler
error when other really const variables are added with __initconst.

As the struct machine_desc member dt_compat is declared as

	const char *const *dt_compat;

making the arrays const is the better alternative over changing all
annotations to __initdata.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent d88d6cfc

arch/arm/mach-axxia/axxia.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/init.h>

#include <asm/mach/arch.h>



static const char *axxia_dt_match[] __initconst = {

static const char *const axxia_dt_match[] __initconst = {

	"lsi,axm5516",

	"lsi,axm5516-sim",

	"lsi,axm5516-emu",

arch/arm/mach-bcm/brcmstb.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <asm/mach-types.h>

#include <asm/mach/arch.h>



static const char *brcmstb_match[] __initconst = {

static const char *const brcmstb_match[] __initconst = {

	"brcm,bcm7445",

	"brcm,brcmstb",

	NULL

arch/arm/mach-exynos/exynos.c

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ static void __init exynos_dt_machine_init(void) 
	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}



static char const *exynos_dt_compat[] __initconst = {

static char const *const exynos_dt_compat[] __initconst = {

	"samsung,exynos3",

	"samsung,exynos3250",

	"samsung,exynos4",

arch/arm/mach-highbank/highbank.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static void __init highbank_init(void) 
		platform_device_register(&highbank_cpuidle_device);

}



static const char *highbank_match[] __initconst = {

static const char *const highbank_match[] __initconst = {

	"calxeda,highbank",

	"calxeda,ecx-2000",

	NULL,

arch/arm/mach-hisi/hisilicon.c

+4 −4
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static void __init hi3620_map_io(void) 
	iotable_init(hi3620_io_desc, ARRAY_SIZE(hi3620_io_desc));

}



static const char *hi3xxx_compat[] __initconst = {

static const char *const hi3xxx_compat[] __initconst = {

	"hisilicon,hi3620-hi4511",

	NULL,

};
@@ -55,7 +55,7 @@ DT_MACHINE_START(HI3620, "Hisilicon Hi3620 (Flattened Device Tree)") 
	.dt_compat	= hi3xxx_compat,

MACHINE_END



static const char *hix5hd2_compat[] __initconst = {

static const char *const hix5hd2_compat[] __initconst = {

	"hisilicon,hix5hd2",

	NULL,

};
@@ -64,7 +64,7 @@ DT_MACHINE_START(HIX5HD2_DT, "Hisilicon HIX5HD2 (Flattened Device Tree)") 
	.dt_compat	= hix5hd2_compat,

MACHINE_END



static const char *hip04_compat[] __initconst = {

static const char *const hip04_compat[] __initconst = {

	"hisilicon,hip04-d01",

	NULL,

};
@@ -73,7 +73,7 @@ DT_MACHINE_START(HIP04, "Hisilicon HiP04 (Flattened Device Tree)") 
	.dt_compat	= hip04_compat,

MACHINE_END



static const char *hip01_compat[] __initconst = {

static const char *const hip01_compat[] __initconst = {

	"hisilicon,hip01",

	"hisilicon,hip01-ca9x2",

	NULL,