diff options
| author |   Thierry Reding <treding@nvidia.com> | 2017-11-07 19:15:48 +0100 |
|---|---|---|
| committer |   Linus Walleij <linus.walleij@linaro.org> | 2017-11-08 14:07:20 +0100 |
| commit | c7a0aa59524c5bb20bebaca360f7c5faaec6b806 (patch) | |
| tree | d4eec845e9b4a22a2596e45fd5438e6b8f89b0c3 /include/linux/gpio | |
| parent | gpio: Move irqdomain into struct gpio_irq_chip (diff) | |
| download | linux-dev-c7a0aa59524c5bb20bebaca360f7c5faaec6b806.tar.xz linux-dev-c7a0aa59524c5bb20bebaca360f7c5faaec6b806.zip | |
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>
Diffstat (limited to 'include/linux/gpio')
| -rw-r--r-- | include/linux/gpio/driver.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h index c5dfa8c0b829..864f507e859b 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h @@ -47,6 +47,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: * * The interrupt handler for the GPIO chip's parent interrupts, may be @@ -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; |