From: Linus Walleij <linus.walleij@linaro.org>
Date: Thu, 9 Nov 2017 08:36:07 +0000 (+0100)
Subject: pinctrl: bcm2835: Fix some merge fallout
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9e9355bb2096c3a9e8baa2ff2e09ac43eeeadc72;p=linux.git

pinctrl: bcm2835: Fix some merge fallout

Fixing a small merge problem in BCM2835 related to the
new irqchip code.

Cc: Thierry Reding <treding@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---

diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
index fb85ab3cf6628..72d1227482930 100644
--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
@@ -383,7 +383,7 @@ static void bcm2835_gpio_irq_handle_bank(struct bcm2835_pinctrl *pc,
 		/* FIXME: no clue why the code looks up the type here */
 		type = pc->irq_type[gpio];
 
-		generic_handle_irq(irq_linear_revmap(pc->gpio_chip.irq.irqdomain,
+		generic_handle_irq(irq_linear_revmap(pc->gpio_chip.irq.domain,
 						     gpio));
 	}
 }