ARM: omap1: Fix new user of gpiochip_request_own_desc()
diff mbox series

Message ID 20181215115407.22137-1-linus.walleij@linaro.org
State New
Headers show
Series
  • ARM: omap1: Fix new user of gpiochip_request_own_desc()
Related show

Commit Message

Linus Walleij Dec. 15, 2018, 11:54 a.m. UTC
This fixes up a new user of gpiochip_request_own_desc() in
the AMS Delta board that appeared after the patch that was
applied recently.

Cc: Janusz Krzysztofik <jmkrzyszt@gmail.com>
Cc: Tony Lindgren <tony@atomide.com>
Fixes: 21abf103818a ("gpio: Pass a flag to gpiochip_request_own_desc()")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 arch/arm/mach-omap1/board-ams-delta.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Janusz Krzysztofik Dec. 16, 2018, 10:07 a.m. UTC | #1
Hi Linus,

On Saturday, December 15, 2018 12:54:07 PM CET Linus Walleij wrote:
> This fixes up a new user of gpiochip_request_own_desc() in
> the AMS Delta board that appeared after the patch that was
> applied recently.
> 
> Cc: Janusz Krzysztofik <jmkrzyszt@gmail.com>
> Cc: Tony Lindgren <tony@atomide.com>
> Fixes: 21abf103818a ("gpio: Pass a flag to gpiochip_request_own_desc()")
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
>  arch/arm/mach-omap1/board-ams-delta.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

There is one more AMS Delta related file where gpiod_request_own_desc() is 
called and the same fix is needed: arch/arm/mach-omap1/ams-delta-fiq.c.  With 
that fixed, you can add my

	Reviewed-by: Janusz Krzysztofik <jkrzyszt@gmail.com>

> diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/
board-ams-delta.c
> index 6719e139eb62..b53ff6399d31 100644
> --- a/arch/arm/mach-omap1/board-ams-delta.c
> +++ b/arch/arm/mach-omap1/board-ams-delta.c
> @@ -603,7 +603,7 @@ static void __init modem_assign_irq(struct gpio_chip 
*chip)
>  	struct gpio_desc *gpiod;
>  
>  	gpiod = gpiochip_request_own_desc(chip, AMS_DELTA_GPIO_PIN_MODEM_IRQ,
> -					  "modem_irq");
> +					  "modem_irq", 0);

Both here and in ams-delta-fiq.c as well, gpiod_direction_input() is called 
soon after. That could be dropped if GPIOD_FLAGS_BIT_DIR_SET was used instead 
of 0.  I can take care of that and prepare a follow up patch if you prefer 
this one being kept as minimal as possible.

Thanks,
Janusz

>  	if (IS_ERR(gpiod)) {
>  		pr_err("%s: modem IRQ GPIO request failed (%ld)\n", __func__,
>  		       PTR_ERR(gpiod));
>
Linus Walleij Dec. 16, 2018, 7:39 p.m. UTC | #2
On Sun, Dec 16, 2018 at 11:04 AM Janusz Krzysztofik <jmkrzyszt@gmail.com> wrote:

> There is one more AMS Delta related file where gpiod_request_own_desc() is
> called and the same fix is needed: arch/arm/mach-omap1/ams-delta-fiq.c.

I handled that in the original patch actually! :)

>  With
> that fixed, you can add my
>
>         Reviewed-by: Janusz Krzysztofik <jkrzyszt@gmail.com>

Thanks!

> >       gpiod = gpiochip_request_own_desc(chip, AMS_DELTA_GPIO_PIN_MODEM_IRQ,
> > -                                       "modem_irq");
> > +                                       "modem_irq", 0);
>
> Both here and in ams-delta-fiq.c as well, gpiod_direction_input() is called
> soon after. That could be dropped if GPIOD_FLAGS_BIT_DIR_SET was used instead
> of 0.  I can take care of that and prepare a follow up patch if you prefer
> this one being kept as minimal as possible.

It's better if you send a separate patch as follow-up because
you know what you are doing, in contrast to me ... I just change
the function signature because I have to, it is always super scary
to patch other people's board files.

Yours,
Linus Walleij
Tony Lindgren Dec. 17, 2018, 6:46 p.m. UTC | #3
* Linus Walleij <linus.walleij@linaro.org> [181215 11:56]:
> This fixes up a new user of gpiochip_request_own_desc() in
> the AMS Delta board that appeared after the patch that was
> applied recently.
> 
> Cc: Janusz Krzysztofik <jmkrzyszt@gmail.com>
> Cc: Tony Lindgren <tony@atomide.com>
> Fixes: 21abf103818a ("gpio: Pass a flag to gpiochip_request_own_desc()")
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

Sounds like you already applied, and no need to recommit,
so just for reference:

Acked-by: Tony Lindgren <tony@atomide.com>

Patch
diff mbox series

diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
index 6719e139eb62..b53ff6399d31 100644
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@ -603,7 +603,7 @@  static void __init modem_assign_irq(struct gpio_chip *chip)
 	struct gpio_desc *gpiod;
 
 	gpiod = gpiochip_request_own_desc(chip, AMS_DELTA_GPIO_PIN_MODEM_IRQ,
-					  "modem_irq");
+					  "modem_irq", 0);
 	if (IS_ERR(gpiod)) {
 		pr_err("%s: modem IRQ GPIO request failed (%ld)\n", __func__,
 		       PTR_ERR(gpiod));