[PATCH] ARM: remove duplicate 'const' annotations'
From: arnd@arndb.de (Arnd Bergmann)
Date: 2017-05-19 08:14:35
Also in:
linux-omap, lkml
On Thu, May 11, 2017 at 1:50 PM, Arnd Bergmann [off-list ref] 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 <redacted>
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