gpio: pl061: use local state for parent IRQ storage

The driver is poking around in the struct gpio_chip internals,
which is a no-no. Use a variable in the local state container.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c
index 6e3c1430616f8684e3f0729be7c15dcf7df5dc18..8838a44351ce4062a802f8e9c8e405d5e9839fdb 100644 (file)
--- a/drivers/gpio/gpio-pl061.c
+++ b/drivers/gpio/gpio-pl061.c
@@ -55,6 +55,7 @@ struct pl061_gpio {
 
        void __iomem            *base;
        struct gpio_chip        gc;
+       int                     parent_irq;
 
 #ifdef CONFIG_PM
        struct pl061_context_save_regs csave_regs;
@@ -276,8 +277,9 @@ static void pl061_irq_ack(struct irq_data *d)
 static int pl061_irq_set_wake(struct irq_data *d, unsigned int state)
 {
        struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
+       struct pl061_gpio *chip = gpiochip_get_data(gc);
 
-       return irq_set_irq_wake(gc->irq_parent, state);
+       return irq_set_irq_wake(chip->parent_irq, state);
 }
 
 static struct irq_chip pl061_irqchip = {
@@ -345,6 +347,7 @@ static int pl061_probe(struct amba_device *adev, const struct amba_id *id)
                dev_err(&adev->dev, "invalid IRQ\n");
                return -ENODEV;
        }
+       chip->parent_irq = irq;
 
        ret = gpiochip_irqchip_add(&chip->gc, &pl061_irqchip,
                                   irq_base, handle_bad_irq,