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>

2 files changed, 10 insertions, 5 deletions

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 9ee75a45ba37..dafbca12c4ca 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -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;
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;