These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpio / gpio-tz1090.c

diff --git a/kernel/drivers/gpio/gpio-tz1090.c b/kernel/drivers/gpio/gpio-tz1090.c
index 445660a..87bb1b1 100644 (file)
--- a/kernel/drivers/gpio/gpio-tz1090.c
+++ b/kernel/drivers/gpio/gpio-tz1090.c
@@ -375,7 +375,7 @@ static int gpio_set_irq_wake(struct irq_data *data, unsigned int on)
 #define gpio_set_irq_wake NULL
 #endif
 
-static void tz1090_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void tz1090_gpio_irq_handler(struct irq_desc *desc)
 {
        irq_hw_number_t hw;
        unsigned int irq_stat, irq_no;
@@ -400,7 +400,7 @@ static void tz1090_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
                                == IRQ_TYPE_EDGE_BOTH)
                        tz1090_gpio_irq_next_edge(bank, hw);
 
-               generic_handle_irq_desc(irq_no, child_desc);
+               generic_handle_irq_desc(child_desc);
        }
 }
 
@@ -510,8 +510,8 @@ static int tz1090_gpio_bank_probe(struct tz1090_gpio_bank_info *info)
        gc->chip_types[1].chip.flags            = IRQCHIP_MASK_ON_SUSPEND;
 
        /* Setup chained handler for this GPIO bank */
-       irq_set_handler_data(bank->irq, bank);
-       irq_set_chained_handler(bank->irq, tz1090_gpio_irq_handler);
+       irq_set_chained_handler_and_data(bank->irq, tz1090_gpio_irq_handler,
+                                        bank);
 
        return 0;
 }