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

Commit c7a0aa59 authored by Thierry Reding's avatar Thierry Reding Committed by Linus Walleij
Browse files

gpio: Move irq_handler to 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: default avatarThierry Reding <treding@nvidia.com>
Acked-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent f0fbe7bc

drivers/gpio/gpiolib.c

+2 −2
Original line number Diff line number Diff line
@@ -1646,7 +1646,7 @@ static int gpiochip_irq_map(struct irq_domain *d, unsigned int irq, 
	 * category than their parents, so it won't report false recursion.

	 */

	irq_set_lockdep_class(irq, chip->lock_key);

	irq_set_chip_and_handler(irq, chip->irq.chip, chip->irq_handler);

	irq_set_chip_and_handler(irq, chip->irq.chip, chip->irq.handler);

	/* Chips that use nested thread handlers have them marked */

	if (chip->irq_nested)

		irq_set_nested_thread(irq, 1);
@@ -1820,7 +1820,7 @@ int gpiochip_irqchip_add_key(struct gpio_chip *gpiochip, 
	}



	gpiochip->irq.chip = irqchip;

	gpiochip->irq_handler = handler;

	gpiochip->irq.handler = handler;

	gpiochip->irq_default_type = type;

	gpiochip->to_irq = gpiochip_to_irq;

	gpiochip->lock_key = lock_key;

include/linux/gpio/driver.h

+8 −3
Original line number Diff line number Diff line
@@ -46,6 +46,14 @@ struct gpio_irq_chip { 
	 */

	const struct irq_domain_ops *domain_ops;



	/**

	 * @handler:

	 *

	 * The IRQ handler to use (often a predefined IRQ core function) for

	 * GPIO IRQs, provided by GPIO driver.

	 */

	irq_flow_handler_t handler;



	/**

	 * @parent_handler:

	 *
@@ -132,8 +140,6 @@ static inline struct gpio_irq_chip *to_gpio_irq_chip(struct irq_chip *chip) 
 *	safely.

 * @bgpio_dir: shadowed direction register for generic GPIO to clear/set

 *	direction safely.

 * @irq_handler: the irq handler to use (often a predefined irq core function)

 *	for GPIO IRQs, provided by GPIO driver

 * @irq_default_type: default IRQ triggering type applied during GPIO driver

 *	initialization, provided by GPIO driver

 * @irq_chained_parent: GPIO IRQ chip parent/bank linux irq number,
@@ -214,7 +220,6 @@ struct gpio_chip { 
	 * With CONFIG_GPIOLIB_IRQCHIP we get an irqchip inside the gpiolib

	 * to handle IRQs for most practical cases.

	 */

	irq_flow_handler_t	irq_handler;

	unsigned int		irq_default_type;

	unsigned int		irq_chained_parent;

	bool			irq_nested;