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

[kvmfornfv.git] / kernel / arch / arm / mach-sa1100 / neponset.c

diff --git a/kernel/arch/arm/mach-sa1100/neponset.c b/kernel/arch/arm/mach-sa1100/neponset.c
index af868d2..8411985 100644 (file)
--- a/kernel/arch/arm/mach-sa1100/neponset.c
+++ b/kernel/arch/arm/mach-sa1100/neponset.c
@@ -166,7 +166,7 @@ static struct sa1100_port_fns neponset_port_fns = {
  * ensure that the IRQ signal is deasserted before returning.  This
  * is rather unfortunate.
  */
-static void neponset_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void neponset_irq_handler(struct irq_desc *desc)
 {
        struct neponset_drvdata *d = irq_desc_get_handler_data(desc);
        unsigned int irr;
@@ -320,15 +320,14 @@ static int neponset_probe(struct platform_device *dev)
 
        irq_set_chip_and_handler(d->irq_base + NEP_IRQ_SMC91X, &nochip,
                handle_simple_irq);
-       set_irq_flags(d->irq_base + NEP_IRQ_SMC91X, IRQF_VALID | IRQF_PROBE);
+       irq_clear_status_flags(d->irq_base + NEP_IRQ_SMC91X, IRQ_NOREQUEST | IRQ_NOPROBE);
        irq_set_chip_and_handler(d->irq_base + NEP_IRQ_USAR, &nochip,
                handle_simple_irq);
-       set_irq_flags(d->irq_base + NEP_IRQ_USAR, IRQF_VALID | IRQF_PROBE);
+       irq_clear_status_flags(d->irq_base + NEP_IRQ_USAR, IRQ_NOREQUEST | IRQ_NOPROBE);
        irq_set_chip(d->irq_base + NEP_IRQ_SA1111, &nochip);
 
        irq_set_irq_type(irq, IRQ_TYPE_EDGE_RISING);
-       irq_set_handler_data(irq, d);
-       irq_set_chained_handler(irq, neponset_irq_handler);
+       irq_set_chained_handler_and_data(irq, neponset_irq_handler, d);
 
        /*
         * We would set IRQ_GPIO25 to be a wake-up IRQ, but unfortunately