sh-pfc: Terminate gpios array by -1

0 is a valid GPIO value, use -1 to terminate the gpios array in IRQ
lists.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/sh-pfc/gpio.c b/drivers/pinctrl/sh-pfc/gpio.c
index 3d30e6ecdf4a32468b3c7ffc90525da45da1c5ee..c24be810f56ce2c01acb76dc6ef14f9da6fdd288 100644 (file)
--- a/drivers/pinctrl/sh-pfc/gpio.c
+++ b/drivers/pinctrl/sh-pfc/gpio.c
@@ -207,9 +207,9 @@ static int gpio_pin_to_irq(struct gpio_chip *gc, unsigned offset)
        unsigned int i, k;
 
        for (i = 0; i < pfc->info->gpio_irq_size; i++) {
-               unsigned short *gpios = pfc->info->gpio_irq[i].gpios;
+               short *gpios = pfc->info->gpio_irq[i].gpios;
 
-               for (k = 0; gpios[k]; k++) {
+               for (k = 0; gpios[k] >= 0; k++) {
                        if (gpios[k] == offset)
                                return pfc->info->gpio_irq[i].irq;
                }

diff --git a/drivers/pinctrl/sh-pfc/sh_pfc.h b/drivers/pinctrl/sh-pfc/sh_pfc.h
index 8a494e557b436189d717d045d4e04f59f7c6459e..e17ccab54f2d8f9226d58e10a7627068f6969082 100644 (file)
--- a/drivers/pinctrl/sh-pfc/sh_pfc.h
+++ b/drivers/pinctrl/sh-pfc/sh_pfc.h
@@ -94,11 +94,11 @@ struct pinmux_data_reg {
 
 struct pinmux_irq {
        int irq;
-       unsigned short *gpios;
+       short *gpios;
 };
 
 #define PINMUX_IRQ(irq_nr, ids...)                        \
-       { .irq = irq_nr, .gpios = (unsigned short []) { ids, 0 } }      \
+       { .irq = irq_nr, .gpios = (short []) { ids, -1 } }
 
 struct pinmux_range {
        u16 begin;