Commit 0527873b authored by Arnd Bergmann's avatar Arnd Bergmann

ARM: remove duplicate 'const' annotations'

gcc-7 warns about some declarations that are more 'const' than necessary:

arch/arm/mach-at91/pm.c:338:34: error: duplicate 'const' declaration specifier [-Werror=duplicate-decl-specifier]
 static const struct of_device_id const ramc_ids[] __initconst = {
arch/arm/mach-bcm/bcm_kona_smc.c:36:34: error: duplicate 'const' declaration specifier [-Werror=duplicate-decl-specifier]
 static const struct of_device_id const bcm_kona_smc_ids[] __initconst = {
arch/arm/mach-spear/time.c:207:34: error: duplicate 'const' declaration specifier [-Werror=duplicate-decl-specifier]
 static const struct of_device_id const timer_of_match[] __initconst = {
arch/arm/mach-omap2/prm_common.c:714:34: error: duplicate 'const' declaration specifier [-Werror=duplicate-decl-specifier]
 static const struct of_device_id const omap_prcm_dt_match_table[] __initconst = {
arch/arm/mach-omap2/vc.c:562:35: error: duplicate 'const' declaration specifier [-Werror=duplicate-decl-specifier]
 static const struct i2c_init_data const omap4_i2c_timing_data[] __initconst = {

The ones in arch/arm were apparently all introduced accidentally by one
commit that correctly marked a lot of variables as __initconst.

Fixes: 19c233b7 ("ARM: appropriate __init annotation for const data")
Acked-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: default avatarKrzysztof Hałasa <khalasa@piap.pl>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent ec16187a
...@@ -335,7 +335,7 @@ static const struct ramc_info ramc_infos[] __initconst = { ...@@ -335,7 +335,7 @@ static const struct ramc_info ramc_infos[] __initconst = {
{ .idle = sama5d3_ddr_standby, .memctrl = AT91_MEMCTRL_DDRSDR}, { .idle = sama5d3_ddr_standby, .memctrl = AT91_MEMCTRL_DDRSDR},
}; };
static const struct of_device_id const ramc_ids[] __initconst = { static const struct of_device_id ramc_ids[] __initconst = {
{ .compatible = "atmel,at91rm9200-sdramc", .data = &ramc_infos[0] }, { .compatible = "atmel,at91rm9200-sdramc", .data = &ramc_infos[0] },
{ .compatible = "atmel,at91sam9260-sdramc", .data = &ramc_infos[1] }, { .compatible = "atmel,at91sam9260-sdramc", .data = &ramc_infos[1] },
{ .compatible = "atmel,at91sam9g45-ddramc", .data = &ramc_infos[2] }, { .compatible = "atmel,at91sam9g45-ddramc", .data = &ramc_infos[2] },
......
...@@ -33,7 +33,7 @@ struct bcm_kona_smc_data { ...@@ -33,7 +33,7 @@ struct bcm_kona_smc_data {
unsigned result; unsigned result;
}; };
static const struct of_device_id const bcm_kona_smc_ids[] __initconst = { static const struct of_device_id bcm_kona_smc_ids[] __initconst = {
{.compatible = "brcm,kona-smc"}, {.compatible = "brcm,kona-smc"},
{.compatible = "bcm,kona-smc"}, /* deprecated name */ {.compatible = "bcm,kona-smc"}, /* deprecated name */
{}, {},
......
...@@ -346,7 +346,7 @@ static struct usb_ohci_pdata cns3xxx_usb_ohci_pdata = { ...@@ -346,7 +346,7 @@ static struct usb_ohci_pdata cns3xxx_usb_ohci_pdata = {
.power_off = csn3xxx_usb_power_off, .power_off = csn3xxx_usb_power_off,
}; };
static const struct of_dev_auxdata const cns3xxx_auxdata[] __initconst = { static const struct of_dev_auxdata cns3xxx_auxdata[] __initconst = {
{ "intel,usb-ehci", CNS3XXX_USB_BASE, "ehci-platform", &cns3xxx_usb_ehci_pdata }, { "intel,usb-ehci", CNS3XXX_USB_BASE, "ehci-platform", &cns3xxx_usb_ehci_pdata },
{ "intel,usb-ohci", CNS3XXX_USB_OHCI_BASE, "ohci-platform", &cns3xxx_usb_ohci_pdata }, { "intel,usb-ohci", CNS3XXX_USB_OHCI_BASE, "ohci-platform", &cns3xxx_usb_ohci_pdata },
{ "cavium,cns3420-ahci", CNS3XXX_SATA2_BASE, "ahci", NULL }, { "cavium,cns3420-ahci", CNS3XXX_SATA2_BASE, "ahci", NULL },
......
...@@ -711,7 +711,7 @@ static struct omap_prcm_init_data scrm_data __initdata = { ...@@ -711,7 +711,7 @@ static struct omap_prcm_init_data scrm_data __initdata = {
}; };
#endif #endif
static const struct of_device_id const omap_prcm_dt_match_table[] __initconst = { static const struct of_device_id omap_prcm_dt_match_table[] __initconst = {
#ifdef CONFIG_SOC_AM33XX #ifdef CONFIG_SOC_AM33XX
{ .compatible = "ti,am3-prcm", .data = &am3_prm_data }, { .compatible = "ti,am3-prcm", .data = &am3_prm_data },
#endif #endif
......
...@@ -559,7 +559,7 @@ struct i2c_init_data { ...@@ -559,7 +559,7 @@ struct i2c_init_data {
u8 hsscll_12; u8 hsscll_12;
}; };
static const struct i2c_init_data const omap4_i2c_timing_data[] __initconst = { static const struct i2c_init_data omap4_i2c_timing_data[] __initconst = {
{ {
.load = 50, .load = 50,
.loadbits = 0x3, .loadbits = 0x3,
......
...@@ -204,7 +204,7 @@ static void __init spear_clockevent_init(int irq) ...@@ -204,7 +204,7 @@ static void __init spear_clockevent_init(int irq)
setup_irq(irq, &spear_timer_irq); setup_irq(irq, &spear_timer_irq);
} }
static const struct of_device_id const timer_of_match[] __initconst = { static const struct of_device_id timer_of_match[] __initconst = {
{ .compatible = "st,spear-timer", }, { .compatible = "st,spear-timer", },
{ }, { },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment