| Message ID | 1426981535-1800-1-git-send-email-stefan@agner.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Stefan, On 15-03-21 04:45 PM, Stefan Agner wrote: > The const declaration for char* is actually duplicated, however > the array of strings is currently not constant. However, typically > the dt_compat array is declared as const char *const. Follow > that convention and also add the __initconst macro for constant > initialization data. > Acked-by: Scott Branden <sbranden@broadcom.com> > Signed-off-by: Stefan Agner <stefan@agner.ch> > --- > This was uncovered by a LLVM/clang warning: > arch/arm/mach-bcm/bcm_cygnus.c:16:19: warning: duplicate 'const' declaration > specifier [-Wduplicate-decl-specifier] > static const char const *bcm_cygnus_dt_compat[] = { > ^~~~~~ > 1 warning generated. > > arch/arm/mach-bcm/bcm_cygnus.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mach-bcm/bcm_cygnus.c b/arch/arm/mach-bcm/bcm_cygnus.c > index 30dc58b..7ae894c 100644 > --- a/arch/arm/mach-bcm/bcm_cygnus.c > +++ b/arch/arm/mach-bcm/bcm_cygnus.c > @@ -13,7 +13,7 @@ > > #include <asm/mach/arch.h> > > -static const char const *bcm_cygnus_dt_compat[] = { > +static const char * const bcm_cygnus_dt_compat[] __initconst = { > "brcm,cygnus", > NULL, > }; > Thanks for submitting. We will test this. Scott
On 3/23/2015 10:18 PM, Scott Branden wrote: > Hi Stefan, > > On 15-03-21 04:45 PM, Stefan Agner wrote: >> The const declaration for char* is actually duplicated, however >> the array of strings is currently not constant. However, typically >> the dt_compat array is declared as const char *const. Follow >> that convention and also add the __initconst macro for constant >> initialization data. >> > Acked-by: Scott Branden <sbranden@broadcom.com> >> Signed-off-by: Stefan Agner <stefan@agner.ch> >> --- >> This was uncovered by a LLVM/clang warning: >> arch/arm/mach-bcm/bcm_cygnus.c:16:19: warning: duplicate 'const' >> declaration >> specifier [-Wduplicate-decl-specifier] >> static const char const *bcm_cygnus_dt_compat[] = { >> ^~~~~~ >> 1 warning generated. >> >> arch/arm/mach-bcm/bcm_cygnus.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/arch/arm/mach-bcm/bcm_cygnus.c >> b/arch/arm/mach-bcm/bcm_cygnus.c >> index 30dc58b..7ae894c 100644 >> --- a/arch/arm/mach-bcm/bcm_cygnus.c >> +++ b/arch/arm/mach-bcm/bcm_cygnus.c >> @@ -13,7 +13,7 @@ >> >> #include <asm/mach/arch.h> >> >> -static const char const *bcm_cygnus_dt_compat[] = { >> +static const char * const bcm_cygnus_dt_compat[] __initconst = { >> "brcm,cygnus", >> NULL, >> }; >> > Thanks for submitting. We will test this. > > Scott Change looks fine and tested fine on Cygnus BCM958300k board. Thanks! Reviewed-by: Ray Jui <rjui@broadcom.com> Tested-by: Ray Jui <rjui@broadcom.com>
Hello Stefan, On Sun, Mar 22, 2015 at 12:45:35AM +0100, Stefan Agner wrote: > The const declaration for char* is actually duplicated, however > the array of strings is currently not constant. However, typically > the dt_compat array is declared as const char *const. Follow > that convention and also add the __initconst macro for constant > initialization data. > > Signed-off-by: Stefan Agner <stefan@agner.ch> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Thanks Uwe
On 21/03/15 16:45, Stefan Agner wrote: > The const declaration for char* is actually duplicated, however > the array of strings is currently not constant. However, typically > the dt_compat array is declared as const char *const. Follow > that convention and also add the __initconst macro for constant > initialization data. > > Signed-off-by: Stefan Agner <stefan@agner.ch> Applied to platform/next, thanks
diff --git a/arch/arm/mach-bcm/bcm_cygnus.c b/arch/arm/mach-bcm/bcm_cygnus.c index 30dc58b..7ae894c 100644 --- a/arch/arm/mach-bcm/bcm_cygnus.c +++ b/arch/arm/mach-bcm/bcm_cygnus.c @@ -13,7 +13,7 @@ #include <asm/mach/arch.h> -static const char const *bcm_cygnus_dt_compat[] = { +static const char * const bcm_cygnus_dt_compat[] __initconst = { "brcm,cygnus", NULL, };
The const declaration for char* is actually duplicated, however the array of strings is currently not constant. However, typically the dt_compat array is declared as const char *const. Follow that convention and also add the __initconst macro for constant initialization data. Signed-off-by: Stefan Agner <stefan@agner.ch> --- This was uncovered by a LLVM/clang warning: arch/arm/mach-bcm/bcm_cygnus.c:16:19: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier] static const char const *bcm_cygnus_dt_compat[] = { ^~~~~~ 1 warning generated. arch/arm/mach-bcm/bcm_cygnus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)