ARM: omap1: fix incorrect placement of __initdata tag
Subsystems (3)
PATCH 1/1 ARM: omap1: 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.
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>
--- arch/arm/mach-omap1/gpio15xx.c | 8 ++++---- arch/arm/mach-omap1/gpio16xx.c | 22 +++++++++++----------- arch/arm/mach-omap1/gpio7xx.c | 30 +++++++++++++++--------------- 3 files changed, 30 insertions(+), 30 deletions(-)
arch/arm/mach-omap1/gpio15xx.c +4 -4
@@ -25,7 +25,7 @@#define OMAP1510_GPIO_BASE 0xFFFCE000/* gpio1 */ -static struct __initdata resource omap15xx_mpu_gpio_resources[] = { +static struct resource omap15xx_mpu_gpio_resources[]__initdata = { { .start =OMAP1_MPUIO_VBASE , .end =OMAP1_MPUIO_VBASE +SZ_2K -1 ,
@@ -48,7 +48,7 @@ static struct omap_gpio_reg_offs omap15xx_mpuio_regs = { .irqctrl = OMAP_MPUIO_GPIO_INT_EDGE, }; -static struct __initdata omap_gpio_platform_data omap15xx_mpu_gpio_config = { +static struct omap_gpio_platform_data omap15xx_mpu_gpio_config__initdata = { .is_mpuio = true, .bank_width =16 , .bank_stride =1 ,
@@ -66,7 +66,7 @@ static struct platform_device omap15xx_mpu_gpio = { };/* gpio2 */ -static struct __initdata resource omap15xx_gpio_resources[] = { +static struct resource omap15xx_gpio_resources[]__initdata = { { .start =OMAP1510_GPIO_BASE , .end =OMAP1510_GPIO_BASE +SZ_2K -1 ,
@@ -90,7 +90,7 @@ static struct omap_gpio_reg_offs omap15xx_gpio_regs = { .pinctrl = OMAP1510_GPIO_PIN_CONTROL, }; -static struct __initdata omap_gpio_platform_data omap15xx_gpio_config = { +static struct omap_gpio_platform_data omap15xx_gpio_config__initdata = { .bank_width =16 , .regs = &omap15xx_gpio_regs, };
arch/arm/mach-omap1/gpio16xx.c +11 -11
@@ -31,7 +31,7 @@#define SYSCONFIG_WORD 0x14/* mpu gpio */ -static struct __initdata resource omap16xx_mpu_gpio_resources[] = { +static struct resource omap16xx_mpu_gpio_resources[]__initdata = { { .start =OMAP1_MPUIO_VBASE , .end =OMAP1_MPUIO_VBASE +SZ_2K -1 ,
@@ -54,7 +54,7 @@ static struct omap_gpio_reg_offs omap16xx_mpuio_regs = { .irqctrl = OMAP_MPUIO_GPIO_INT_EDGE, }; -static struct __initdata omap_gpio_platform_data omap16xx_mpu_gpio_config = { +static struct omap_gpio_platform_data omap16xx_mpu_gpio_config__initdata = { .is_mpuio = true, .bank_width =16 , .bank_stride =1 ,
@@ -72,7 +72,7 @@ static struct platform_device omap16xx_mpu_gpio = { };/* gpio1 */ -static struct __initdata resource omap16xx_gpio1_resources[] = { +static struct resource omap16xx_gpio1_resources[]__initdata = { { .start =OMAP1610_GPIO1_BASE , .end =OMAP1610_GPIO1_BASE +SZ_2K -1 ,
@@ -100,7 +100,7 @@ static struct omap_gpio_reg_offs omap16xx_gpio_regs = { .edgectrl2 = OMAP1610_GPIO_EDGE_CTRL2, }; -static struct __initdata omap_gpio_platform_data omap16xx_gpio1_config = { +static struct omap_gpio_platform_data omap16xx_gpio1_config__initdata = { .bank_width =16 , .regs = &omap16xx_gpio_regs, };
@@ -116,7 +116,7 @@ static struct platform_device omap16xx_gpio1 = { };/* gpio2 */ -static struct __initdata resource omap16xx_gpio2_resources[] = { +static struct resource omap16xx_gpio2_resources[]__initdata = { { .start =OMAP1610_GPIO2_BASE , .end =OMAP1610_GPIO2_BASE +SZ_2K -1 ,
@@ -128,7 +128,7 @@ static struct __initdata resource omap16xx_gpio2_resources[] = { }, }; -static struct __initdata omap_gpio_platform_data omap16xx_gpio2_config = { +static struct omap_gpio_platform_data omap16xx_gpio2_config__initdata = { .bank_width =16 , .regs = &omap16xx_gpio_regs, };
@@ -144,7 +144,7 @@ static struct platform_device omap16xx_gpio2 = { };/* gpio3 */ -static struct __initdata resource omap16xx_gpio3_resources[] = { +static struct resource omap16xx_gpio3_resources[]__initdata = { { .start =OMAP1610_GPIO3_BASE , .end =OMAP1610_GPIO3_BASE +SZ_2K -1 ,
@@ -156,7 +156,7 @@ static struct __initdata resource omap16xx_gpio3_resources[] = { }, }; -static struct __initdata omap_gpio_platform_data omap16xx_gpio3_config = { +static struct omap_gpio_platform_data omap16xx_gpio3_config__initdata = { .bank_width =16 , .regs = &omap16xx_gpio_regs, };
@@ -172,7 +172,7 @@ static struct platform_device omap16xx_gpio3 = { };/* gpio4 */ -static struct __initdata resource omap16xx_gpio4_resources[] = { +static struct resource omap16xx_gpio4_resources[]__initdata = { { .start =OMAP1610_GPIO4_BASE , .end =OMAP1610_GPIO4_BASE +SZ_2K -1 ,
@@ -184,7 +184,7 @@ static struct __initdata resource omap16xx_gpio4_resources[] = { }, }; -static struct __initdata omap_gpio_platform_data omap16xx_gpio4_config = { +static struct omap_gpio_platform_data omap16xx_gpio4_config__initdata = { .bank_width =16 , .regs = &omap16xx_gpio_regs, };
@@ -199,7 +199,7 @@ static struct platform_device omap16xx_gpio4 = { .resource = omap16xx_gpio4_resources, }; -static struct __initdata platform_device * omap16xx_gpio_dev[] = { +static struct platform_device *omap16xx_gpio_dev[]__initdata = { &omap16xx_mpu_gpio, &omap16xx_gpio1, &omap16xx_gpio2,
arch/arm/mach-omap1/gpio7xx.c +15 -15
@@ -30,7 +30,7 @@#define OMAP1_MPUIO_VBASE OMAP1_MPUIO_BASE/* mpu gpio */ -static struct __initdata resource omap7xx_mpu_gpio_resources[] = { +static struct resource omap7xx_mpu_gpio_resources[]__initdata = { { .start =OMAP1_MPUIO_VBASE , .end =OMAP1_MPUIO_VBASE +SZ_2K -1 ,
@@ -53,7 +53,7 @@ static struct omap_gpio_reg_offs omap7xx_mpuio_regs = { .irqctrl = OMAP_MPUIO_GPIO_INT_EDGE >> 1, }; -static struct __initdata omap_gpio_platform_data omap7xx_mpu_gpio_config = { +static struct omap_gpio_platform_data omap7xx_mpu_gpio_config__initdata = { .is_mpuio = true, .bank_width =16 , .bank_stride =2 ,
@@ -71,7 +71,7 @@ static struct platform_device omap7xx_mpu_gpio = { };/* gpio1 */ -static struct __initdata resource omap7xx_gpio1_resources[] = { +static struct resource omap7xx_gpio1_resources[]__initdata = { { .start =OMAP7XX_GPIO1_BASE , .end =OMAP7XX_GPIO1_BASE +SZ_2K -1 ,
@@ -94,7 +94,7 @@ static struct omap_gpio_reg_offs omap7xx_gpio_regs = { .irqctrl = OMAP7XX_GPIO_INT_CONTROL, }; -static struct __initdata omap_gpio_platform_data omap7xx_gpio1_config = { +static struct omap_gpio_platform_data omap7xx_gpio1_config__initdata = { .bank_width =32 , .regs = &omap7xx_gpio_regs, };
@@ -110,7 +110,7 @@ static struct platform_device omap7xx_gpio1 = { };/* gpio2 */ -static struct __initdata resource omap7xx_gpio2_resources[] = { +static struct resource omap7xx_gpio2_resources[]__initdata = { { .start =OMAP7XX_GPIO2_BASE , .end =OMAP7XX_GPIO2_BASE +SZ_2K -1 ,
@@ -122,7 +122,7 @@ static struct __initdata resource omap7xx_gpio2_resources[] = { }, }; -static struct __initdata omap_gpio_platform_data omap7xx_gpio2_config = { +static struct omap_gpio_platform_data omap7xx_gpio2_config__initdata = { .bank_width =32 , .regs = &omap7xx_gpio_regs, };
@@ -138,7 +138,7 @@ static struct platform_device omap7xx_gpio2 = { };/* gpio3 */ -static struct __initdata resource omap7xx_gpio3_resources[] = { +static struct resource omap7xx_gpio3_resources[]__initdata = { { .start =OMAP7XX_GPIO3_BASE , .end =OMAP7XX_GPIO3_BASE +SZ_2K -1 ,
@@ -150,7 +150,7 @@ static struct __initdata resource omap7xx_gpio3_resources[] = { }, }; -static struct __initdata omap_gpio_platform_data omap7xx_gpio3_config = { +static struct omap_gpio_platform_data omap7xx_gpio3_config__initdata = { .bank_width =32 , .regs = &omap7xx_gpio_regs, };
@@ -166,7 +166,7 @@ static struct platform_device omap7xx_gpio3 = { };/* gpio4 */ -static struct __initdata resource omap7xx_gpio4_resources[] = { +static struct resource omap7xx_gpio4_resources[]__initdata = { { .start =OMAP7XX_GPIO4_BASE , .end =OMAP7XX_GPIO4_BASE +SZ_2K -1 ,
@@ -178,7 +178,7 @@ static struct __initdata resource omap7xx_gpio4_resources[] = { }, }; -static struct __initdata omap_gpio_platform_data omap7xx_gpio4_config = { +static struct omap_gpio_platform_data omap7xx_gpio4_config__initdata = { .bank_width =32 , .regs = &omap7xx_gpio_regs, };
@@ -194,7 +194,7 @@ static struct platform_device omap7xx_gpio4 = { };/* gpio5 */ -static struct __initdata resource omap7xx_gpio5_resources[] = { +static struct resource omap7xx_gpio5_resources[]__initdata = { { .start =OMAP7XX_GPIO5_BASE , .end =OMAP7XX_GPIO5_BASE +SZ_2K -1 ,
@@ -206,7 +206,7 @@ static struct __initdata resource omap7xx_gpio5_resources[] = { }, }; -static struct __initdata omap_gpio_platform_data omap7xx_gpio5_config = { +static struct omap_gpio_platform_data omap7xx_gpio5_config__initdata = { .bank_width =32 , .regs = &omap7xx_gpio_regs, };
@@ -222,7 +222,7 @@ static struct platform_device omap7xx_gpio5 = { };/* gpio6 */ -static struct __initdata resource omap7xx_gpio6_resources[] = { +static struct resource omap7xx_gpio6_resources[]__initdata = { { .start =OMAP7XX_GPIO6_BASE , .end =OMAP7XX_GPIO6_BASE +SZ_2K -1 ,
@@ -234,7 +234,7 @@ static struct __initdata resource omap7xx_gpio6_resources[] = { }, }; -static struct __initdata omap_gpio_platform_data omap7xx_gpio6_config = { +static struct omap_gpio_platform_data omap7xx_gpio6_config__initdata = { .bank_width =32 , .regs = &omap7xx_gpio_regs, };
@@ -249,7 +249,7 @@ static struct platform_device omap7xx_gpio6 = { .resource = omap7xx_gpio6_resources, }; -static struct __initdata platform_device * omap7xx_gpio_dev[] = { +static struct platform_device *omap7xx_gpio_dev[]__initdata = { &omap7xx_mpu_gpio, &omap7xx_gpio1, &omap7xx_gpio2,
Signature · 1 line
1.8.2.3
Tony Lindgren
reviewerQuoted 2 lines · Bartlomiej Zolnierkiewicz
__initdatatag should be placed between the variable name and equal sign for the variable to be placed in the intended .init.data section.
Thanks applying into omap-for-v3.13/fixes-not-urgent.
Tony