genirq: Remove irq argument from irq flow handlers

[linux-drm-fsl-dcu.git] / drivers / gpio / gpio-pxa.c

diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c
index cdbbcf0faf9da4a263504f7a7b0cc3d8aabc8cdb..df2ce550f30929c1a20d1aca81e538a367f8f97b 100644 (file)
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@ -401,7 +401,7 @@ static int pxa_gpio_irq_type(struct irq_data *d, unsigned int type)
        return 0;
 }
 
-static void pxa_gpio_demux_handler(unsigned int irq, struct irq_desc *desc)
+static void pxa_gpio_demux_handler(struct irq_desc *desc)
 {
        struct pxa_gpio_chip *c;
        int loop, gpio, gpio_base, n;
@@ -524,7 +524,7 @@ static int pxa_irq_domain_map(struct irq_domain *d, unsigned int irq,
 {
        irq_set_chip_and_handler(irq, &pxa_muxed_gpio_chip,
                                 handle_edge_irq);
-       set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
+       irq_set_noprobe(irq);
        return 0;
 }
 
@@ -643,20 +643,20 @@ static int pxa_gpio_probe(struct platform_device *pdev)
                        irq = gpio_to_irq(0);
                        irq_set_chip_and_handler(irq, &pxa_muxed_gpio_chip,
                                                 handle_edge_irq);
-                       set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
+                       irq_clear_status_flags(irq, IRQ_NOREQUEST | IRQ_NOPROBE);
                }
                if (irq1 > 0) {
                        irq = gpio_to_irq(1);
                        irq_set_chip_and_handler(irq, &pxa_muxed_gpio_chip,
                                                 handle_edge_irq);
-                       set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
+                       irq_clear_status_flags(irq, IRQ_NOREQUEST | IRQ_NOPROBE);
                }
 
                for (irq  = gpio_to_irq(gpio_offset);
                        irq <= gpio_to_irq(pxa_last_gpio); irq++) {
                        irq_set_chip_and_handler(irq, &pxa_muxed_gpio_chip,
                                                 handle_edge_irq);
-                       set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
+                       irq_clear_status_flags(irq, IRQ_NOREQUEST | IRQ_NOPROBE);
                }
        }