pinctrl: bcm2835: Fix some merge fallout

Message ID 20171109083710.3567-1-linus.walleij@linaro.org
State New
Headers show
Series
  • pinctrl: bcm2835: Fix some merge fallout
Related show

Commit Message

Linus Walleij Nov. 9, 2017, 8:37 a.m.
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>
---
 drivers/pinctrl/bcm/pinctrl-bcm2835.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Thierry Reding Nov. 9, 2017, 10:05 a.m. | #1
On Thu, Nov 09, 2017 at 09:37:10AM +0100, Linus Walleij wrote:
> 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>
> ---
>  drivers/pinctrl/bcm/pinctrl-bcm2835.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

I was just going to send out a fixup for this as well. Looks like this
may be the result of the conflict that I had mentioned.

Anyway, not that you really need it, but:

Reviewed-by: Thierry Reding <treding@nvidia.com>

Patch

diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
index fb85ab3cf662..72d122748293 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));
 	}
 }