Merge tag 'v5.9' into next

[linux-2.6-microblaze.git] / drivers / bcma / driver_gpio.c

diff --git a/drivers/bcma/driver_gpio.c b/drivers/bcma/driver_gpio.c
index a5df3d1..8a1e470 100644 (file)
--- a/drivers/bcma/driver_gpio.c
+++ b/drivers/bcma/driver_gpio.c
@@ -122,6 +122,7 @@ static irqreturn_t bcma_gpio_irq_handler(int irq, void *dev_id)
 static int bcma_gpio_irq_init(struct bcma_drv_cc *cc)
 {
        struct gpio_chip *chip = &cc->gpio;
+       struct gpio_irq_chip *girq = &chip->irq;
        int hwirq, err;
 
        if (cc->core->bus->hosttype != BCMA_HOSTTYPE_SOC)
@@ -136,15 +137,13 @@ static int bcma_gpio_irq_init(struct bcma_drv_cc *cc)
        bcma_chipco_gpio_intmask(cc, ~0, 0);
        bcma_cc_set32(cc, BCMA_CC_IRQMASK, BCMA_CC_IRQ_GPIO);
 
-       err =  gpiochip_irqchip_add(chip,
-                                   &bcma_gpio_irq_chip,
-                                   0,
-                                   handle_simple_irq,
-                                   IRQ_TYPE_NONE);
-       if (err) {
-               free_irq(hwirq, cc);
-               return err;
-       }
+       girq->chip = &bcma_gpio_irq_chip;
+       /* This will let us handle the parent IRQ in the driver */
+       girq->parent_handler = NULL;
+       girq->num_parents = 0;
+       girq->parents = NULL;
+       girq->default_type = IRQ_TYPE_NONE;
+       girq->handler = handle_simple_irq;
 
        return 0;
 }
@@ -212,13 +211,13 @@ int bcma_gpio_init(struct bcma_drv_cc *cc)
        else
                chip->base              = -1;
 
-       err = gpiochip_add_data(chip, cc);
+       err = bcma_gpio_irq_init(cc);
        if (err)
                return err;
 
-       err = bcma_gpio_irq_init(cc);
+       err = gpiochip_add_data(chip, cc);
        if (err) {
-               gpiochip_remove(chip);
+               bcma_gpio_irq_exit(cc);
                return err;
        }