[PATCH v2 06/16] gpio: Move irq_default_type to struct gpio_irq_chip

[Thierry Reding]

From: Thierry Reding <tred...@nvidia.com>

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 <tred...@nvidia.com>
---
 drivers/gpio/gpiolib.c      | 10 +++++-----
 include/linux/gpio/driver.h | 11 ++++++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index dc44f2c97498..bbad2eae30e2 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1655,8 +1655,8 @@ int gpiochip_irq_map(struct irq_domain *d, unsigned int 
irq,
         * No set-up of the hardware will happen if IRQ_TYPE_NONE
         * is passed as default type.
         */
-       if (chip->irq_default_type != IRQ_TYPE_NONE)
-               irq_set_irq_type(irq, chip->irq_default_type);
+       if (chip->irq.default_type != IRQ_TYPE_NONE)
+               irq_set_irq_type(irq, chip->irq.default_type);
 
        return 0;
 }
@@ -1733,7 +1733,7 @@ static int gpiochip_add_irqchip(struct gpio_chip 
*gpiochip)
                return -EINVAL;
        }
 
-       type = gpiochip->irq_default_type;
+       type = gpiochip->irq.default_type;
        np = gpiochip->parent->of_node;
 
 #ifdef CONFIG_OF_GPIO
@@ -1762,7 +1762,7 @@ static int gpiochip_add_irqchip(struct gpio_chip 
*gpiochip)
        }
 
        gpiochip->to_irq = gpiochip_to_irq;
-       gpiochip->irq_default_type = type;
+       gpiochip->irq.default_type = type;
 
        if (gpiochip->irq.domain_ops)
                ops = gpiochip->irq.domain_ops;
@@ -1950,7 +1950,7 @@ int gpiochip_irqchip_add_key(struct gpio_chip *gpiochip,
 
        gpiochip->irq.chip = irqchip;
        gpiochip->irq.handler = handler;
-       gpiochip->irq_default_type = type;
+       gpiochip->irq.default_type = type;
        gpiochip->to_irq = gpiochip_to_irq;
        gpiochip->lock_key = lock_key;
        gpiochip->irq.domain = irq_domain_add_simple(of_node,
diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h
index b1398ea0c32a..bcf93afddfa6 100644
--- a/include/linux/gpio/driver.h
+++ b/include/linux/gpio/driver.h
@@ -62,6 +62,14 @@ struct gpio_irq_chip {
         */
        irq_flow_handler_t handler;
 
+       /**
+        * @default_type:
+        *
+        * Default IRQ triggering type applied during GPIO driver
+        * initialization, provided by GPIO driver.
+        */
+       unsigned int default_type;
+
        /**
         * @parent_handler:
         *
@@ -168,8 +176,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_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,
  *     provided by GPIO driver for chained interrupt (not for nested
  *     interrupts).
@@ -245,7 +251,6 @@ struct gpio_chip {
         * With CONFIG_GPIOLIB_IRQCHIP we get an irqchip inside the gpiolib
         * to handle IRQs for most practical cases.
         */
-       unsigned int            irq_default_type;
        unsigned int            irq_chained_parent;
        bool                    irq_nested;
        bool                    irq_need_valid_mask;
-- 
2.14.1