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

[kvmfornfv.git] / kernel / arch / arm / mach-gemini / gpio.c

diff --git a/kernel/arch/arm/mach-gemini/gpio.c b/kernel/arch/arm/mach-gemini/gpio.c
index f8cb571..2478d9f 100644 (file)
--- a/kernel/arch/arm/mach-gemini/gpio.c
+++ b/kernel/arch/arm/mach-gemini/gpio.c
@@ -126,7 +126,7 @@ static int gpio_set_irq_type(struct irq_data *d, unsigned int type)
        return 0;
 }
 
-static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void gpio_irq_handler(struct irq_desc *desc)
 {
        unsigned int port = (unsigned int)irq_desc_get_handler_data(desc);
        unsigned int gpio_irq_no, irq_stat;
@@ -220,11 +220,11 @@ void __init gemini_gpio_init(void)
                     j < GPIO_IRQ_BASE + (i + 1) * 32; j++) {
                        irq_set_chip_and_handler(j, &gpio_irq_chip,
                                                 handle_edge_irq);
-                       set_irq_flags(j, IRQF_VALID);
+                       irq_clear_status_flags(j, IRQ_NOREQUEST);
                }
 
-               irq_set_chained_handler(IRQ_GPIO(i), gpio_irq_handler);
-               irq_set_handler_data(IRQ_GPIO(i), (void *)i);
+               irq_set_chained_handler_and_data(IRQ_GPIO(i), gpio_irq_handler,
+                                                (void *)i);
        }
 
        BUG_ON(gpiochip_add(&gemini_gpio_chip));