gpio: Move irq_handler to struct gpio_irq_chip

[linux-2.6-block.git] / include / linux / gpio / driver.h

diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h
index c5dfa8c0b82971e5fc258ab4dba22eda44502d1e..864f507e859b38a167593a4f472857a3406c37ba 100644 (file)
--- a/include/linux/gpio/driver.h
+++ b/include/linux/gpio/driver.h
@@ -46,6 +46,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:
         *
@@ -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;