Commit 71ebb396 authored Jan 05, 2018 by Arnd Bergmann

Merge commit '8bb65fc0' into next/soc



This includes one fix from mainline to avoid introducing a build
regression after the pxa tree starts using gpio-reg:

drivers/gpio/gpio-reg.c:106:21: error: 'struct gpio_reg' has no member named 'irq'; did you mean 'irqs'?
drivers/gpio/gpio-reg.c:107:29: error: 'struct gpio_reg' has no member named 'irq'; did you mean 'irqs'?

* commit '8bb65fc0':
  gpio: gpio-reg: fix build

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 5796e682 8bb65fc0

drivers/gpio/gpio-reg.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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->irq.domain)
		irq = irq_find_mapping(r->irq.domain, irq);
		if (irq >= 0 && r->irqdomain)
		irq = irq_find_mapping(r->irqdomain, irq);

		return irq;
		}

Admin message