p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Thierry Reding <treding@nvidia.com>
Acked-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Thierry Reding 2017-11-07 19:15:48 +01:00 committed by Linus Walleij
parent f0fbe7bce7
commit c7a0aa5952
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpio/gpiolib.c
View File

@ -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. * category than their parents, so it won't report false recursion.
*/ */
irq_set_lockdep_class(irq, chip->lock_key); 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 */ /* 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_nested_thread(irq, 1);
@ -1820,7 +1820,7 @@ int gpiochip_irqchip_add_key(struct gpio_chip *gpiochip,
} }
gpiochip->irq.chip = irqchip; gpiochip->irq.chip = irqchip;
gpiochip->irq_handler = handler; gpiochip->irq.handler = handler;
gpiochip->irq_default_type = type; gpiochip->irq_default_type = type;
gpiochip->to_irq = gpiochip_to_irq; gpiochip->to_irq = gpiochip_to_irq;
gpiochip->lock_key = lock_key; gpiochip->lock_key = lock_key;

11
include/linux/gpio/driver.h
View File

@ -46,6 +46,14 @@ struct gpio_irq_chip {
*/ */
const struct irq_domain_ops *domain_ops; 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: * @parent_handler:
* *
@ -132,8 +140,6 @@ static inline struct gpio_irq_chip *to_gpio_irq_chip(struct irq_chip *chip)
* safely. * safely.
* @bgpio_dir: shadowed direction register for generic GPIO to clear/set * @bgpio_dir: shadowed direction register for generic GPIO to clear/set
* direction safely. * 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 * @irq_default_type: default IRQ triggering type applied during GPIO driver
* initialization, provided by GPIO driver * initialization, provided by GPIO driver
* @irq_chained_parent: GPIO IRQ chip parent/bank linux irq number, * @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 * With CONFIG_GPIOLIB_IRQCHIP we get an irqchip inside the gpiolib
* to handle IRQs for most practical cases. * to handle IRQs for most practical cases.
*/ */
irq_flow_handler_t irq_handler;
unsigned int irq_default_type; unsigned int irq_default_type;
unsigned int irq_chained_parent; unsigned int irq_chained_parent;
bool irq_nested; bool irq_nested;