powerpc/8xx: tqm8xx: fix incorrect placement of __initdata tag
Subsystems (2)
PATCH 1/1 powerpc/8xx: tqm8xx: fix incorrect placement of __initdata tag
__initdata tag should be placed between the variable name and equal sign for the variable to be placed in the intended .init.data section.
--- arch/powerpc/platforms/8xx/tqm8xx_setup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/platforms/8xx/tqm8xx_setup.c +2 -2
@@ -48,7 +48,7 @@ struct cpm_pin {int port, pin, flags; }; -static struct __initdata cpm_pin tqm8xx_pins[] = { +static struct cpm_pin tqm8xx_pins[]__initdata = {/* SMC1 */ {CPM_PORTB ,24 ,CPM_PIN_INPUT },/* RX */ {CPM_PORTB ,25 ,CPM_PIN_INPUT |CPM_PIN_SECONDARY },/* TX */
@@ -63,7 +63,7 @@ static struct __initdata cpm_pin tqm8xx_pins[] = { {CPM_PORTC, 11, CPM_PIN_INPUT | CPM_PIN_SECONDARY | CPM_PIN_GPIO}, }; -static struct __initdata cpm_pin tqm8xx_fec_pins[] = { +static struct cpm_pin tqm8xx_fec_pins[]__initdata = {/* MII */ {CPM_PORTD ,3 ,CPM_PIN_OUTPUT }, {CPM_PORTD, 4, CPM_PIN_OUTPUT},
Signature · 1 line
1.8.2.3
Quoted 2 lines
__initdatatag should be placed between the variable name and equal sign for the variable to be placed in the intended .init.data section.
...
arch/powerpc/platforms/8xx/tqm8xx_setup.c struct cpm_pin { · line 51
Quoted 2 lines
arch/powerpc/platforms/8xx/tqm8xx_setup.c +1
-1-static struct __initdata cpm_pin tqm8xx_pins[] = { +static struct cpm_pin tqm8xx_pins[]__initdata = {
As far as gcc is concerned it can go almost anywhere before the '=', even before the 'static'.
Splitting 'struct cpm_pin' does seem an odd choice.
The Linux coding standards might suggest a location.
I'd have thought that either before or after the 'static' would be best (ie as a storage class qualifier).
David
Quoted 9 lines · David Laight
Quoted 2 lines
__initdatatag should be placed between the variable name and equal sign for the variable to be placed in the intended .init.data section....
arch/powerpc/platforms/8xx/tqm8xx_setup.c struct cpm_pin { · line 51
Quoted 2 lines
arch/powerpc/platforms/8xx/tqm8xx_setup.c +1
-1-static struct __initdata cpm_pin tqm8xx_pins[] = { +static struct cpm_pin tqm8xx_pins[]__initdata = {As far as gcc is concerned it can go almost anywhere before the '=', even before the 'static'.
Splitting 'structcpm_pin' does seem an odd choice.
It is not only an odd choice, it just doesn't work as it should in the practice (as tested with gcc-4.6.3 from Ubuntu 12.04).
Quoted 3 lines
The Linux coding standards might suggest a location.
I'd have thought that either before or after the 'static' would be best (ie as a storage class qualifier).
The majority of the kernel code uses __initdata before equal sign and the __initdata documentation in <linux/init.h> recommends such usage:
"
* For initialized data:
* You should insert __initdata or __initconst between the variable name
* and equal sign followed by value, e.g.:
*
* static int init_variable __initdata = 0;
* static const char linux_logo[] __initconst = { 0x32, 0x36, ... };
"
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics