xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpio: pl061: use local state for parent IRQ storage

Browse Source 
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>
This commit is contained in:
Linus Walleij
2016-11-25 10:41:37 +01:00
parent 1001354ca3
commit 9c18be8e93
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpio/gpio-pl061.c
View File

@@ -55,6 +55,7 @@ struct pl061_gpio {
void __iomem *base; void __iomem *base;
struct gpio_chip gc; struct gpio_chip gc;
int parent_irq;
#ifdef CONFIG_PM #ifdef CONFIG_PM
struct pl061_context_save_regs csave_regs; 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) 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 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 = { 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"); dev_err(&adev->dev, "invalid IRQ\n");
return -ENODEV; return -ENODEV;
} }
chip->parent_irq = irq;
ret = gpiochip_irqchip_add(&chip->gc, &pl061_irqchip, ret = gpiochip_irqchip_add(&chip->gc, &pl061_irqchip,
irq_base, handle_bad_irq, irq_base, handle_bad_irq,