[PATCH 2/2] sh-pfc: Fix PINMUX_GPIO macro

[PATCH 2/2] sh-pfc: Fix PINMUX_GPIO macro

[Laurent Pinchart]

Commit 7cbb0e55e27e ("sh-pfc: Don't duplicate argument to PINMUX_GPIO
macro") erronesouly modified the PINMUX_GPIO macro in a way that
resulted in all pins being named "name". Fix the macro to name the pins
correctly.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 drivers/pinctrl/sh-pfc/sh_pfc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pinctrl/sh-pfc/sh_pfc.h b/drivers/pinctrl/sh-pfc/sh_pfc.h
index 8a494e5..463ef21 100644
--- a/drivers/pinctrl/sh-pfc/sh_pfc.h
+++ b/drivers/pinctrl/sh-pfc/sh_pfc.h
@@ -254,7 +254,7 @@ struct sh_pfc_soc_info {
 #define PINMUX_GPIO(_pin)						\
 	[GPIO_##_pin] = {						\
 		.pin = (u16)-1,						\
-		.name = __stringify(name),				\
+		.name = __stringify(GPIO_##_pin),			\
 		.enum_id = _pin##_DATA,					\
 	}
 
-- 
1.8.3.2

Re: [PATCH 2/2] sh-pfc: Fix PINMUX_GPIO macro

[Simon Horman]

On Tue, Nov 26, 2013 at 02:45:34AM +0100, Laurent Pinchart wrote:
> Commit 7cbb0e55e27e ("sh-pfc: Don't duplicate argument to PINMUX_GPIO
> macro") erronesouly modified the PINMUX_GPIO macro in a way that
> resulted in all pins being named "name". Fix the macro to name the pins
> correctly.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

Reviewed-by: Simon Horman <horms+renesas@verge.net.au>

> ---
>  drivers/pinctrl/sh-pfc/sh_pfc.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/pinctrl/sh-pfc/sh_pfc.h b/drivers/pinctrl/sh-pfc/sh_pfc.h
> index 8a494e5..463ef21 100644
> --- a/drivers/pinctrl/sh-pfc/sh_pfc.h
> +++ b/drivers/pinctrl/sh-pfc/sh_pfc.h
> @@ -254,7 +254,7 @@ struct sh_pfc_soc_info {
>  #define PINMUX_GPIO(_pin)						\
>  	[GPIO_##_pin] = {						\
>  		.pin = (u16)-1,						\
> -		.name = __stringify(name),				\
> +		.name = __stringify(GPIO_##_pin),			\
>  		.enum_id = _pin##_DATA,					\
>  	}
>  
> -- 
> 1.8.3.2
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH 2/2] sh-pfc: Fix PINMUX_GPIO macro

[Linus Walleij]

On Tue, Nov 26, 2013 at 2:45 AM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> wrote:

> Commit 7cbb0e55e27e ("sh-pfc: Don't duplicate argument to PINMUX_GPIO
> macro") erronesouly modified the PINMUX_GPIO macro in a way that
> resulted in all pins being named "name". Fix the macro to name the pins
> correctly.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Or is this a regression I should apply for fixes?

Yours,
Linus Walleij

Re: [PATCH 2/2] sh-pfc: Fix PINMUX_GPIO macro

[Laurent Pinchart]

Hi Linus,

On Tuesday 03 December 2013 10:34:36 Linus Walleij wrote:
> On Tue, Nov 26, 2013 at 2:45 AM, Laurent Pinchart wrote:
> > Commit 7cbb0e55e27e ("sh-pfc: Don't duplicate argument to PINMUX_GPIO
> > macro") erronesouly modified the PINMUX_GPIO macro in a way that
> > resulted in all pins being named "name". Fix the macro to name the pins
> > correctly.
> > 
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas@ideasonboard.com>
> 
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
> 
> Or is this a regression I should apply for fixes?

The problem has been introduced in v3.12. It could be sent as a bug fix to 
v3.13 and CC'ed to stable. If you do so, please let me know and I'll remove 
the patch from my pull request.

-- 
Regards,

Laurent Pinchart

Re: [PATCH 2/2] sh-pfc: Fix PINMUX_GPIO macro

[Linus Walleij]

On Wed, Dec 4, 2013 at 2:06 AM, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
> On Tuesday 03 December 2013 10:34:36 Linus Walleij wrote:
>> On Tue, Nov 26, 2013 at 2:45 AM, Laurent Pinchart wrote:
>> > Commit 7cbb0e55e27e ("sh-pfc: Don't duplicate argument to PINMUX_GPIO
>> > macro") erronesouly modified the PINMUX_GPIO macro in a way that
>> > resulted in all pins being named "name". Fix the macro to name the pins
>> > correctly.
>> >
>> > Signed-off-by: Laurent Pinchart
>> > <laurent.pinchart+renesas@ideasonboard.com>
>>
>> Acked-by: Linus Walleij <linus.walleij@linaro.org>
>>
>> Or is this a regression I should apply for fixes?
>
> The problem has been introduced in v3.12. It could be sent as a bug fix to
> v3.13 and CC'ed to stable. If you do so, please let me know and I'll remove
> the patch from my pull request.

OK I've applied this for fixes and added CC to stable.

Yours,
Linus Walleij