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

[kvmfornfv.git] / kernel / drivers / sh / intc / core.c

diff --git a/kernel/drivers/sh/intc/core.c b/kernel/drivers/sh/intc/core.c
index 81f2298..8e72bcb 100644 (file)
--- a/kernel/drivers/sh/intc/core.c
+++ b/kernel/drivers/sh/intc/core.c
@@ -65,9 +65,9 @@ void intc_set_prio_level(unsigned int irq, unsigned int level)
        raw_spin_unlock_irqrestore(&intc_big_lock, flags);
 }
 
-static void intc_redirect_irq(unsigned int irq, struct irq_desc *desc)
+static void intc_redirect_irq(struct irq_desc *desc)
 {
-       generic_handle_irq((unsigned int)irq_get_handler_data(irq));
+       generic_handle_irq((unsigned int)irq_desc_get_handler_data(desc));
 }
 
 static void __init intc_register_irq(struct intc_desc *desc,
@@ -366,8 +366,9 @@ int __init register_intc_controller(struct intc_desc *desc)
 
                        /* redirect this interrupts to the first one */
                        irq_set_chip(irq2, &dummy_irq_chip);
-                       irq_set_chained_handler(irq2, intc_redirect_irq);
-                       irq_set_handler_data(irq2, (void *)irq);
+                       irq_set_chained_handler_and_data(irq2,
+                                                        intc_redirect_irq,
+                                                        (void *)irq);
                }
        }