[PATCH] gpio/mpc8xxx: change irq handler from chained to normal

[Hui Song]

From: Song Hui <hui.son...@nxp.com>

More than one gpio controllers can share one interrupt, change the
driver to request shared irq.

Signed-off-by: Laurentiu Tudor <laurentiu.tu...@nxp.com>
Signed-off-by: Alex Marginean <alexandru.margin...@nxp.com>
Signed-off-by: Song Hui <hui.son...@nxp.com>
---
Changes in v4:
        - convert 'pr_err' to 'dev_err'.
Changes in v3:
        - update the patch description.
Changes in v2:
        - delete the compatible of ls1088a.
 drivers/gpio/gpio-mpc8xxx.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/drivers/gpio/gpio-mpc8xxx.c b/drivers/gpio/gpio-mpc8xxx.c
index 16a47de..e16591b 100644
--- a/drivers/gpio/gpio-mpc8xxx.c
+++ b/drivers/gpio/gpio-mpc8xxx.c
@@ -22,6 +22,7 @@
 #include <linux/irq.h>
 #include <linux/gpio/driver.h>
 #include <linux/bitops.h>
+#include <linux/interrupt.h>
 
 #define MPC8XXX_GPIO_PINS      32
 
@@ -127,10 +128,9 @@ static int mpc8xxx_gpio_to_irq(struct gpio_chip *gc, 
unsigned offset)
                return -ENXIO;
 }
 
-static void mpc8xxx_gpio_irq_cascade(struct irq_desc *desc)
+static irqreturn_t mpc8xxx_gpio_irq_cascade(int irq, void *data)
 {
-       struct mpc8xxx_gpio_chip *mpc8xxx_gc = irq_desc_get_handler_data(desc);
-       struct irq_chip *chip = irq_desc_get_chip(desc);
+       struct mpc8xxx_gpio_chip *mpc8xxx_gc = (struct mpc8xxx_gpio_chip *)data;
        struct gpio_chip *gc = &mpc8xxx_gc->gc;
        unsigned int mask;
 
@@ -139,8 +139,8 @@ static void mpc8xxx_gpio_irq_cascade(struct irq_desc *desc)
        if (mask)
                generic_handle_irq(irq_linear_revmap(mpc8xxx_gc->irq,
                                                     32 - ffs(mask)));
-       if (chip->irq_eoi)
-               chip->irq_eoi(&desc->irq_data);
+
+       return IRQ_HANDLED;
 }
 
 static void mpc8xxx_irq_unmask(struct irq_data *d)
@@ -388,7 +388,7 @@ static int mpc8xxx_probe(struct platform_device *pdev)
 
        ret = gpiochip_add_data(gc, mpc8xxx_gc);
        if (ret) {
-               pr_err("%pOF: GPIO chip registration failed with status %d\n",
+               dev_err("%pOF: GPIO chip registration failed with status %d\n",
                       np, ret);
                goto err;
        }
@@ -409,8 +409,14 @@ static int mpc8xxx_probe(struct platform_device *pdev)
        if (devtype->gpio_dir_in_init)
                devtype->gpio_dir_in_init(gc);
 
-       irq_set_chained_handler_and_data(mpc8xxx_gc->irqn,
-                                        mpc8xxx_gpio_irq_cascade, mpc8xxx_gc);
+       ret = request_irq(mpc8xxx_gc->irqn, mpc8xxx_gpio_irq_cascade,
+               IRQF_NO_THREAD | IRQF_SHARED, "gpio-cascade", mpc8xxx_gc);
+       if (ret) {
+               dev_err("%s: failed to request_irq(%d), ret = %d\n",
+                               np->full_name, mpc8xxx_gc->irqn, ret);
+               goto err;
+       }
+
        return 0;
 err:
        iounmap(mpc8xxx_gc->regs);
-- 
2.9.5