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

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

gpio: Move irq_nested into 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 39e5f096

drivers/gpio/gpiolib.c

+4 −4
Original line number Diff line number Diff line
@@ -1614,7 +1614,7 @@ void gpiochip_set_nested_irqchip(struct gpio_chip *gpiochip, 
				 struct irq_chip *irqchip,

				 unsigned int parent_irq)

{

	if (!gpiochip->irq_nested) {

	if (!gpiochip->irq.nested) {

		chip_err(gpiochip, "tried to nest a chained gpiochip\n");

		return;

	}
@@ -1649,7 +1649,7 @@ static int gpiochip_irq_map(struct irq_domain *d, unsigned int irq, 
	irq_set_lockdep_class(irq, chip->lock_key);

	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)

	if (chip->irq.nested)

		irq_set_nested_thread(irq, 1);

	irq_set_noprobe(irq);
@@ -1667,7 +1667,7 @@ static void gpiochip_irq_unmap(struct irq_domain *d, unsigned int irq) 
{

	struct gpio_chip *chip = d->host_data;



	if (chip->irq_nested)

	if (chip->irq.nested)

		irq_set_nested_thread(irq, 0);

	irq_set_chip_and_handler(irq, NULL, NULL);

	irq_set_chip_data(irq, NULL);
@@ -1801,7 +1801,7 @@ int gpiochip_irqchip_add_key(struct gpio_chip *gpiochip, 
		pr_err("missing gpiochip .dev parent pointer\n");

		return -EINVAL;

	}

	gpiochip->irq_nested = nested;

	gpiochip->irq.nested = nested;

	of_node = gpiochip->parent->of_node;

#ifdef CONFIG_OF_GPIO

	/*

include/linux/gpio/driver.h

+7 −2
Original line number Diff line number Diff line
@@ -92,6 +92,13 @@ struct gpio_irq_chip { 
	 * driver, so the core will only reference this list, not modify it.

	 */

	unsigned int *parents;



	/**

	 * @nested:

	 *

	 * True if set the interrupt handling is nested.

	 */

	bool nested;

};



static inline struct gpio_irq_chip *to_gpio_irq_chip(struct irq_chip *chip)
@@ -163,7 +170,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_nested: True if set the interrupt handling is nested.

 * @irq_need_valid_mask: If set core allocates @irq_valid_mask with all

 *	bits set to one

 * @irq_valid_mask: If not %NULL holds bitmask of GPIOs which are valid to
@@ -238,7 +244,6 @@ struct gpio_chip { 
	 * With CONFIG_GPIOLIB_IRQCHIP we get an irqchip inside the gpiolib

	 * to handle IRQs for most practical cases.

	 */

	bool			irq_nested;

	bool			irq_need_valid_mask;

	unsigned long		*irq_valid_mask;

	struct lock_class_key	*lock_key;