mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-15 16:53:54 +08:00
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: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
parent
d88d6cfc91
commit
543c5040f5
@ -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",
|
||||
|
@ -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
|
||||
|
@ -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",
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -103,7 +103,7 @@ static void __init keystone_init_meminfo(void)
|
||||
pr_info("Switching to high address space at 0x%llx\n", (u64)offset);
|
||||
}
|
||||
|
||||
static const char *keystone_match[] __initconst = {
|
||||
static const char *const keystone_match[] __initconst = {
|
||||
"ti,keystone",
|
||||
NULL,
|
||||
};
|
||||
|
@ -27,7 +27,7 @@
|
||||
#include "mmio.h"
|
||||
#include "clcd.h"
|
||||
|
||||
static const char *nspire_dt_match[] __initconst = {
|
||||
static const char *const nspire_dt_match[] __initconst = {
|
||||
"ti,nspire",
|
||||
"ti,nspire-cx",
|
||||
"ti,nspire-tp",
|
||||
|
@ -21,7 +21,7 @@ static void __init sirfsoc_init_late(void)
|
||||
}
|
||||
|
||||
#ifdef CONFIG_ARCH_ATLAS6
|
||||
static const char *atlas6_dt_match[] __initconst = {
|
||||
static const char *const atlas6_dt_match[] __initconst = {
|
||||
"sirf,atlas6",
|
||||
NULL
|
||||
};
|
||||
@ -36,7 +36,7 @@ MACHINE_END
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_ARCH_PRIMA2
|
||||
static const char *prima2_dt_match[] __initconst = {
|
||||
static const char *const prima2_dt_match[] __initconst = {
|
||||
"sirf,prima2",
|
||||
NULL
|
||||
};
|
||||
@ -52,7 +52,7 @@ MACHINE_END
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_ARCH_ATLAS7
|
||||
static const char *atlas7_dt_match[] __initdata = {
|
||||
static const char *const atlas7_dt_match[] __initconst = {
|
||||
"sirf,atlas7",
|
||||
NULL
|
||||
};
|
||||
|
@ -63,7 +63,7 @@ static void __init s5pv210_dt_init_late(void)
|
||||
s5pv210_pm_init();
|
||||
}
|
||||
|
||||
static char const *s5pv210_dt_compat[] __initconst = {
|
||||
static char const *const s5pv210_dt_compat[] __initconst = {
|
||||
"samsung,s5pc110",
|
||||
"samsung,s5pv210",
|
||||
NULL
|
||||
|
@ -37,7 +37,7 @@ static void __init emev2_map_io(void)
|
||||
iotable_init(emev2_io_desc, ARRAY_SIZE(emev2_io_desc));
|
||||
}
|
||||
|
||||
static const char *emev2_boards_compat_dt[] __initconst = {
|
||||
static const char *const emev2_boards_compat_dt[] __initconst = {
|
||||
"renesas,emev2",
|
||||
NULL,
|
||||
};
|
||||
|
@ -35,7 +35,7 @@ static void __init versatile_dt_init(void)
|
||||
versatile_auxdata_lookup, NULL);
|
||||
}
|
||||
|
||||
static const char *versatile_dt_match[] __initconst = {
|
||||
static const char *const versatile_dt_match[] __initconst = {
|
||||
"arm,versatile-ab",
|
||||
"arm,versatile-pb",
|
||||
NULL,
|
||||
|
Loading…
Reference in New Issue
Block a user