gpio: pxa: remove gpio_to_irq() from hw irq handlers

gpio_to_irq() API expected to be used by GPIO consumers and
not drivers and there are no guarantee that its gpiolib implementation
is irq safe.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c
index 832f3e4..6029899 100644 (file)
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@ -451,7 +451,9 @@ static irqreturn_t pxa_gpio_demux_handler(int in_irq, void *d)
                        for_each_set_bit(n, &gedr, BITS_PER_LONG) {
                                loop = 1;
 
-                               generic_handle_irq(gpio_to_irq(gpio + n));
+                               generic_handle_irq(
+                                       irq_find_mapping(pchip->irqdomain,
+                                                        gpio + n));
                        }
                }
                handled += loop;
@@ -465,9 +467,9 @@ static irqreturn_t pxa_gpio_direct_handler(int in_irq, void *d)
        struct pxa_gpio_chip *pchip = d;
 
        if (in_irq == pchip->irq0) {
-               generic_handle_irq(gpio_to_irq(0));
+               generic_handle_irq(irq_find_mapping(pchip->irqdomain, 0));
        } else if (in_irq == pchip->irq1) {
-               generic_handle_irq(gpio_to_irq(1));
+               generic_handle_irq(irq_find_mapping(pchip->irqdomain, 1));
        } else {
                pr_err("%s() unknown irq %d\n", __func__, in_irq);
                return IRQ_NONE;