| Message ID | 20170511115059.2997141-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 11/05/2017 at 13:50:16 +0200, Arnd Bergmann wrote: > 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. > > Cc: Nicolas Pitre <nico@linaro.org> > Fixes: 19c233b79d1a ("ARM: appropriate __init annotation for const data") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> > --- > arch/arm/mach-at91/pm.c | 2 +- > arch/arm/mach-bcm/bcm_kona_smc.c | 2 +- > arch/arm/mach-cns3xxx/core.c | 2 +- > arch/arm/mach-omap2/prm_common.c | 2 +- > arch/arm/mach-omap2/vc.c | 2 +- > arch/arm/mach-spear/time.c | 2 +- > 6 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c > index 2cd27c830ab6..283e79ab587d 100644 > --- a/arch/arm/mach-at91/pm.c > +++ b/arch/arm/mach-at91/pm.c > @@ -335,7 +335,7 @@ static const struct ramc_info ramc_infos[] __initconst = { > { .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,at91sam9260-sdramc", .data = &ramc_infos[1] }, > { .compatible = "atmel,at91sam9g45-ddramc", .data = &ramc_infos[2] }, > diff --git a/arch/arm/mach-bcm/bcm_kona_smc.c b/arch/arm/mach-bcm/bcm_kona_smc.c > index 5157faa502eb..3937bd5d452f 100644 > --- a/arch/arm/mach-bcm/bcm_kona_smc.c > +++ b/arch/arm/mach-bcm/bcm_kona_smc.c > @@ -33,7 +33,7 @@ struct bcm_kona_smc_data { > 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 = "bcm,kona-smc"}, /* deprecated name */ > {}, > diff --git a/arch/arm/mach-cns3xxx/core.c b/arch/arm/mach-cns3xxx/core.c > index 03da3813f1ab..7d5a44a06648 100644 > --- a/arch/arm/mach-cns3xxx/core.c > +++ b/arch/arm/mach-cns3xxx/core.c > @@ -346,7 +346,7 @@ static struct usb_ohci_pdata cns3xxx_usb_ohci_pdata = { > .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-ohci", CNS3XXX_USB_OHCI_BASE, "ohci-platform", &cns3xxx_usb_ohci_pdata }, > { "cavium,cns3420-ahci", CNS3XXX_SATA2_BASE, "ahci", NULL }, > diff --git a/arch/arm/mach-omap2/prm_common.c b/arch/arm/mach-omap2/prm_common.c > index 2b138b65129a..dc11841ca334 100644 > --- a/arch/arm/mach-omap2/prm_common.c > +++ b/arch/arm/mach-omap2/prm_common.c > @@ -711,7 +711,7 @@ static struct omap_prcm_init_data scrm_data __initdata = { > }; > #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 > { .compatible = "ti,am3-prcm", .data = &am3_prm_data }, > #endif > diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c > index 2028167fff31..d76b1e5eb8ba 100644 > --- a/arch/arm/mach-omap2/vc.c > +++ b/arch/arm/mach-omap2/vc.c > @@ -559,7 +559,7 @@ struct i2c_init_data { > 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, > .loadbits = 0x3, > diff --git a/arch/arm/mach-spear/time.c b/arch/arm/mach-spear/time.c > index 4878ba90026d..289e036c9c30 100644 > --- a/arch/arm/mach-spear/time.c > +++ b/arch/arm/mach-spear/time.c > @@ -204,7 +204,7 @@ static void __init spear_clockevent_init(int 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", }, > { }, > }; > -- > 2.9.0 >
* Alexandre Belloni <alexandre.belloni@free-electrons.com> [170511 05:02]: > On 11/05/2017 at 13:50:16 +0200, Arnd Bergmann wrote: > > 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. > > > > Cc: Nicolas Pitre <nico@linaro.org> > > Fixes: 19c233b79d1a ("ARM: appropriate __init annotation for const data") > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Tony Lindgren <tony@atomide.com> -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, 11 May 2017, Arnd Bergmann wrote: > 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. > > Cc: Nicolas Pitre <nico@linaro.org> > Fixes: 19c233b79d1a ("ARM: appropriate __init annotation for const data") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Nicolas Pitre <nico@linaro.org> > --- > arch/arm/mach-at91/pm.c | 2 +- > arch/arm/mach-bcm/bcm_kona_smc.c | 2 +- > arch/arm/mach-cns3xxx/core.c | 2 +- > arch/arm/mach-omap2/prm_common.c | 2 +- > arch/arm/mach-omap2/vc.c | 2 +- > arch/arm/mach-spear/time.c | 2 +- > 6 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c > index 2cd27c830ab6..283e79ab587d 100644 > --- a/arch/arm/mach-at91/pm.c > +++ b/arch/arm/mach-at91/pm.c > @@ -335,7 +335,7 @@ static const struct ramc_info ramc_infos[] __initconst = { > { .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,at91sam9260-sdramc", .data = &ramc_infos[1] }, > { .compatible = "atmel,at91sam9g45-ddramc", .data = &ramc_infos[2] }, > diff --git a/arch/arm/mach-bcm/bcm_kona_smc.c b/arch/arm/mach-bcm/bcm_kona_smc.c > index 5157faa502eb..3937bd5d452f 100644 > --- a/arch/arm/mach-bcm/bcm_kona_smc.c > +++ b/arch/arm/mach-bcm/bcm_kona_smc.c > @@ -33,7 +33,7 @@ struct bcm_kona_smc_data { > 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 = "bcm,kona-smc"}, /* deprecated name */ > {}, > diff --git a/arch/arm/mach-cns3xxx/core.c b/arch/arm/mach-cns3xxx/core.c > index 03da3813f1ab..7d5a44a06648 100644 > --- a/arch/arm/mach-cns3xxx/core.c > +++ b/arch/arm/mach-cns3xxx/core.c > @@ -346,7 +346,7 @@ static struct usb_ohci_pdata cns3xxx_usb_ohci_pdata = { > .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-ohci", CNS3XXX_USB_OHCI_BASE, "ohci-platform", &cns3xxx_usb_ohci_pdata }, > { "cavium,cns3420-ahci", CNS3XXX_SATA2_BASE, "ahci", NULL }, > diff --git a/arch/arm/mach-omap2/prm_common.c b/arch/arm/mach-omap2/prm_common.c > index 2b138b65129a..dc11841ca334 100644 > --- a/arch/arm/mach-omap2/prm_common.c > +++ b/arch/arm/mach-omap2/prm_common.c > @@ -711,7 +711,7 @@ static struct omap_prcm_init_data scrm_data __initdata = { > }; > #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 > { .compatible = "ti,am3-prcm", .data = &am3_prm_data }, > #endif > diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c > index 2028167fff31..d76b1e5eb8ba 100644 > --- a/arch/arm/mach-omap2/vc.c > +++ b/arch/arm/mach-omap2/vc.c > @@ -559,7 +559,7 @@ struct i2c_init_data { > 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, > .loadbits = 0x3, > diff --git a/arch/arm/mach-spear/time.c b/arch/arm/mach-spear/time.c > index 4878ba90026d..289e036c9c30 100644 > --- a/arch/arm/mach-spear/time.c > +++ b/arch/arm/mach-spear/time.c > @@ -204,7 +204,7 @@ static void __init spear_clockevent_init(int 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", }, > { }, > }; > -- > 2.9.0 > > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 05/11/2017 04:50 AM, Arnd Bergmann wrote: > 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. > > Cc: Nicolas Pitre <nico@linaro.org> > Fixes: 19c233b79d1a ("ARM: appropriate __init annotation for const data") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > arch/arm/mach-bcm/bcm_kona_smc.c | 2 +- Acked-by: Florian Fainelli <f.fainelli@gmail.com>
On 11-05-17, 13:50, Arnd Bergmann wrote: > 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. > > Cc: Nicolas Pitre <nico@linaro.org> > Fixes: 19c233b79d1a ("ARM: appropriate __init annotation for const data") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > arch/arm/mach-spear/time.c | 2 +- Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Arnd Bergmann <arnd@arndb.de> writes: > gcc-7 warns about some declarations that are more 'const' than necessary: > --- a/arch/arm/mach-cns3xxx/core.c > +++ b/arch/arm/mach-cns3xxx/core.c > @@ -346,7 +346,7 @@ static struct usb_ohci_pdata cns3xxx_usb_ohci_pdata = { > .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-ohci", CNS3XXX_USB_OHCI_BASE, "ohci-platform", &cns3xxx_usb_ohci_pdata }, > { "cavium,cns3420-ahci", CNS3XXX_SATA2_BASE, "ahci", NULL }, Acked-by: Krzysztof Hałasa <khalasa@piap.pl>
On Thu, May 11, 2017 at 1:50 PM, Arnd Bergmann <arnd@arndb.de> wrote: > 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. > > Cc: Nicolas Pitre <nico@linaro.org> > Fixes: 19c233b79d1a ("ARM: appropriate __init annotation for const data") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > arch/arm/mach-at91/pm.c | 2 +- > arch/arm/mach-bcm/bcm_kona_smc.c | 2 +- > arch/arm/mach-cns3xxx/core.c | 2 +- > arch/arm/mach-omap2/prm_common.c | 2 +- > arch/arm/mach-omap2/vc.c | 2 +- > arch/arm/mach-spear/time.c | 2 +- > 6 files changed, 6 insertions(+), 6 deletions(-) Applied to fixes now, thanks for the Acks! Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 2cd27c830ab6..283e79ab587d 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -335,7 +335,7 @@ static const struct ramc_info ramc_infos[] __initconst = { { .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,at91sam9260-sdramc", .data = &ramc_infos[1] }, { .compatible = "atmel,at91sam9g45-ddramc", .data = &ramc_infos[2] }, diff --git a/arch/arm/mach-bcm/bcm_kona_smc.c b/arch/arm/mach-bcm/bcm_kona_smc.c index 5157faa502eb..3937bd5d452f 100644 --- a/arch/arm/mach-bcm/bcm_kona_smc.c +++ b/arch/arm/mach-bcm/bcm_kona_smc.c @@ -33,7 +33,7 @@ struct bcm_kona_smc_data { 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 = "bcm,kona-smc"}, /* deprecated name */ {}, diff --git a/arch/arm/mach-cns3xxx/core.c b/arch/arm/mach-cns3xxx/core.c index 03da3813f1ab..7d5a44a06648 100644 --- a/arch/arm/mach-cns3xxx/core.c +++ b/arch/arm/mach-cns3xxx/core.c @@ -346,7 +346,7 @@ static struct usb_ohci_pdata cns3xxx_usb_ohci_pdata = { .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-ohci", CNS3XXX_USB_OHCI_BASE, "ohci-platform", &cns3xxx_usb_ohci_pdata }, { "cavium,cns3420-ahci", CNS3XXX_SATA2_BASE, "ahci", NULL }, diff --git a/arch/arm/mach-omap2/prm_common.c b/arch/arm/mach-omap2/prm_common.c index 2b138b65129a..dc11841ca334 100644 --- a/arch/arm/mach-omap2/prm_common.c +++ b/arch/arm/mach-omap2/prm_common.c @@ -711,7 +711,7 @@ static struct omap_prcm_init_data scrm_data __initdata = { }; #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 { .compatible = "ti,am3-prcm", .data = &am3_prm_data }, #endif diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c index 2028167fff31..d76b1e5eb8ba 100644 --- a/arch/arm/mach-omap2/vc.c +++ b/arch/arm/mach-omap2/vc.c @@ -559,7 +559,7 @@ struct i2c_init_data { 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, .loadbits = 0x3, diff --git a/arch/arm/mach-spear/time.c b/arch/arm/mach-spear/time.c index 4878ba90026d..289e036c9c30 100644 --- a/arch/arm/mach-spear/time.c +++ b/arch/arm/mach-spear/time.c @@ -204,7 +204,7 @@ static void __init spear_clockevent_init(int 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", }, { }, };
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. Cc: Nicolas Pitre <nico@linaro.org> Fixes: 19c233b79d1a ("ARM: appropriate __init annotation for const data") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/arm/mach-at91/pm.c | 2 +- arch/arm/mach-bcm/bcm_kona_smc.c | 2 +- arch/arm/mach-cns3xxx/core.c | 2 +- arch/arm/mach-omap2/prm_common.c | 2 +- arch/arm/mach-omap2/vc.c | 2 +- arch/arm/mach-spear/time.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)