summaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpio-reg.c
diff options
context:
space:
mode:
authorThierry Reding2017-11-07 19:15:47 +0100
committerLinus Walleij2017-11-08 14:06:21 +0100
commitf0fbe7bce733561b76a5b55c5f4625888acd3792 (patch)
tree396ecdc63cab3227779a28cf43a5a3e2c7cfe3b1 /drivers/gpio/gpio-reg.c
parentgpio: Move irqchip into struct gpio_irq_chip (diff)
downloadkernel-qcow2-linux-f0fbe7bce733561b76a5b55c5f4625888acd3792.tar.gz
kernel-qcow2-linux-f0fbe7bce733561b76a5b55c5f4625888acd3792.tar.xz
kernel-qcow2-linux-f0fbe7bce733561b76a5b55c5f4625888acd3792.zip
gpio: Move irqdomain into struct gpio_irq_chip
In order to consolidate the multiple ways to associate an IRQ chip with a GPIO chip, move more fields into the new struct gpio_irq_chip. Signed-off-by: Thierry Reding <treding@nvidia.com> Acked-by: Grygorii Strashko <grygorii.strashko@ti.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpio-reg.c')
-rw-r--r--drivers/gpio/gpio-reg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-reg.c b/drivers/gpio/gpio-reg.c
index e85903eddc68..23e771dba4c1 100644
--- a/drivers/gpio/gpio-reg.c
+++ b/drivers/gpio/gpio-reg.c
@@ -103,8 +103,8 @@ static int gpio_reg_to_irq(struct gpio_chip *gc, unsigned offset)
struct gpio_reg *r = to_gpio_reg(gc);
int irq = r->irqs[offset];
- if (irq >= 0 && r->irqdomain)
- irq = irq_find_mapping(r->irqdomain, irq);
+ if (irq >= 0 && r->irq.domain)
+ irq = irq_find_mapping(r->irq.domain, irq);
return irq;
}