Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91d33cfe authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Walleij
Browse files

pinctrl: at91: Use generic irq_{request,release}_resources() 



The at91-specific irq_{request,release}_resources() callbacks are
identical to the generic ones, modulo the bug fix in 5b76e79c
("gpiolib: irqchip: prevent driver unloading if gpio is used as irq
only").

Until commit 8b67a1f0 ("gpio: don't override irq_*_resources()
callbacks"), the buggy at91-specific callbacks were never used, though.

Hence drop the at91-specific ones in favor of the generic ones.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 109fdf15

drivers/pinctrl/pinctrl-at91.c

+0 −24
Original line number Original line Diff line number Diff line
@@ -1488,28 +1488,6 @@ static void gpio_irq_ack(struct irq_data *d) 
	/* the interrupt is already cleared before by reading ISR */

	/* the interrupt is already cleared before by reading ISR */

}

}





static int gpio_irq_request_res(struct irq_data *d)

{

	struct at91_gpio_chip *at91_gpio = irq_data_get_irq_chip_data(d);

	unsigned	pin = d->hwirq;

	int ret;



	ret = gpiochip_lock_as_irq(&at91_gpio->chip, pin);

	if (ret)

		dev_err(at91_gpio->chip.dev, "unable to lock pind %lu IRQ\n",

			d->hwirq);



	return ret;

}



static void gpio_irq_release_res(struct irq_data *d)

{

	struct at91_gpio_chip *at91_gpio = irq_data_get_irq_chip_data(d);

	unsigned	pin = d->hwirq;



	gpiochip_unlock_as_irq(&at91_gpio->chip, pin);

}



#ifdef CONFIG_PM

#ifdef CONFIG_PM





static u32 wakeups[MAX_GPIO_BANKS];

static u32 wakeups[MAX_GPIO_BANKS];
@@ -1585,8 +1563,6 @@ void at91_pinctrl_gpio_resume(void) 
static struct irq_chip gpio_irqchip = {

static struct irq_chip gpio_irqchip = {

	.name		= "GPIO",

	.name		= "GPIO",

	.irq_ack	= gpio_irq_ack,

	.irq_ack	= gpio_irq_ack,

	.irq_request_resources = gpio_irq_request_res,

	.irq_release_resources = gpio_irq_release_res,

	.irq_disable	= gpio_irq_mask,

	.irq_disable	= gpio_irq_mask,

	.irq_mask	= gpio_irq_mask,

	.irq_mask	= gpio_irq_mask,

	.irq_unmask	= gpio_irq_unmask,

	.irq_unmask	= gpio_irq_unmask,