[PATCH] ARM: shmobile: ape6evm: fix incorrect placement of __initdata tag

[PATCH] ARM: shmobile: ape6evm: fix incorrect placement of __initdata tag

[Bartlomiej Zolnierkiewicz]

__initdata tag should be placed between the variable name and equal
sign for the variable to be placed in the intended .init.data section.

In this particular case __initdata is incorrect as ape6evm_keys_pdata
can be used as a platform data for gpio-keys driver which can be
compiled as module.

Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
 arch/arm/mach-shmobile/board-ape6evm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c
index 7627385..8954f55 100644
--- a/arch/arm/mach-shmobile/board-ape6evm.c
+++ b/arch/arm/mach-shmobile/board-ape6evm.c
@@ -86,7 +86,7 @@ static struct gpio_keys_button gpio_buttons[] = {
 	GPIO_KEY(KEY_VOLUMEDOWN,	329,	"S21"),
 };
 
-static struct __initdata gpio_keys_platform_data ape6evm_keys_pdata = {
+static struct gpio_keys_platform_data ape6evm_keys_pdata = {
 	.buttons	= gpio_buttons,
 	.nbuttons	= ARRAY_SIZE(gpio_buttons),
 };
-- 
1.8.2.3

[PATCH] ARM: shmobile: ape6evm: fix incorrect placement of __initdata tag

[Laurent Pinchart]

Hi Bartlomiej,

Thank you for the patch.

On Monday 30 September 2013 15:07:47 Bartlomiej Zolnierkiewicz wrote:
> __initdata tag should be placed between the variable name and equal
> sign for the variable to be placed in the intended .init.data section.
> 
> In this particular case __initdata is incorrect as ape6evm_keys_pdata
> can be used as a platform data for gpio-keys driver which can be
> compiled as module.

A pointer to the ape6evm_keys_pdata structure is passed to the 
platform_device_register_data() function, which makes a copy of the structure. 
Marking it as __initdata is thus correct.

> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> ---
>  arch/arm/mach-shmobile/board-ape6evm.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-shmobile/board-ape6evm.c
> b/arch/arm/mach-shmobile/board-ape6evm.c index 7627385..8954f55 100644
> --- a/arch/arm/mach-shmobile/board-ape6evm.c
> +++ b/arch/arm/mach-shmobile/board-ape6evm.c
> @@ -86,7 +86,7 @@ static struct gpio_keys_button gpio_buttons[] = {
>  	GPIO_KEY(KEY_VOLUMEDOWN,	329,	"S21"),
>  };
> 
> -static struct __initdata gpio_keys_platform_data ape6evm_keys_pdata = {
> +static struct gpio_keys_platform_data ape6evm_keys_pdata = {
>  	.buttons	= gpio_buttons,
>  	.nbuttons	= ARRAY_SIZE(gpio_buttons),
>  };
-- 
Regards,

Laurent Pinchart

[PATCH] ARM: shmobile: ape6evm: fix incorrect placement of __initdata tag

[Bartlomiej Zolnierkiewicz]

Hi,

On Monday, September 30, 2013 05:05:37 PM Laurent Pinchart wrote:
> Hi Bartlomiej,
> 
> Thank you for the patch.
> 
> On Monday 30 September 2013 15:07:47 Bartlomiej Zolnierkiewicz wrote:
> > __initdata tag should be placed between the variable name and equal
> > sign for the variable to be placed in the intended .init.data section.
> > 
> > In this particular case __initdata is incorrect as ape6evm_keys_pdata
> > can be used as a platform data for gpio-keys driver which can be
> > compiled as module.
> 
> A pointer to the ape6evm_keys_pdata structure is passed to the 
> platform_device_register_data() function, which makes a copy of the structure. 
> Marking it as __initdata is thus correct.

Thanks for catching this. I'll fix the patch and post v2.

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

> > Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> > ---
> >  arch/arm/mach-shmobile/board-ape6evm.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/arch/arm/mach-shmobile/board-ape6evm.c
> > b/arch/arm/mach-shmobile/board-ape6evm.c index 7627385..8954f55 100644
> > --- a/arch/arm/mach-shmobile/board-ape6evm.c
> > +++ b/arch/arm/mach-shmobile/board-ape6evm.c
> > @@ -86,7 +86,7 @@ static struct gpio_keys_button gpio_buttons[] = {
> >  	GPIO_KEY(KEY_VOLUMEDOWN,	329,	"S21"),
> >  };
> > 
> > -static struct __initdata gpio_keys_platform_data ape6evm_keys_pdata = {
> > +static struct gpio_keys_platform_data ape6evm_keys_pdata = {
> >  	.buttons	= gpio_buttons,
> >  	.nbuttons	= ARRAY_SIZE(gpio_buttons),
> >  };

[GIT PULL] Fifth Round of Renesas ARM based SoC fixes for v3.12

[Simon Horman]

Hi Kevin, Olof and Arnd,

please consider this fifth Round of Renesas ARM based SoC fixes for v3.12.

This pull request is based on renesas-fixes4-for-v3.12 which you have
already pulled.


The following changes since commit 3786f86b60833f32e3eeb016fcf8c324f8147e00:

  ARM: shmobile: Remove #gpio-ranges-cells DT property (2013-09-22 21:28:18 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes5-for-v3.12

for you to fetch changes up to 40fca03cae59cfd9b87142ca327abb8a4d386908:

  ARM: shmobile: ape6evm: fix incorrect placement of __initdata tag (2013-10-01 12:53:19 +0900)

----------------------------------------------------------------
Fifth Round of Renesas ARM based SoC fixes for v3.12

* Correct incorrect placement of __initdata tag in ape6evm board code

----------------------------------------------------------------
Bartlomiej Zolnierkiewicz (1):
      ARM: shmobile: ape6evm: fix incorrect placement of __initdata tag

 arch/arm/mach-shmobile/board-ape6evm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[PATCH] ARM: shmobile: ape6evm: fix incorrect placement of __initdata tag

[Simon Horman]

From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

__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 <b.zolnierkie@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/board-ape6evm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c
index 24b87eea..00e3add 100644
--- a/arch/arm/mach-shmobile/board-ape6evm.c
+++ b/arch/arm/mach-shmobile/board-ape6evm.c
@@ -86,7 +86,7 @@ static struct gpio_keys_button gpio_buttons[] = {
 	GPIO_KEY(KEY_VOLUMEDOWN,	329,	"S21"),
 };
 
-static struct __initdata gpio_keys_platform_data ape6evm_keys_pdata = {
+static struct gpio_keys_platform_data ape6evm_keys_pdata __initdata = {
 	.buttons	= gpio_buttons,
 	.nbuttons	= ARRAY_SIZE(gpio_buttons),
 };
-- 
1.8.4