genirq: Fixup core code namespace fallout

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 52b10ad7bd59700d71ee937b0dc75784f564999c..143eb2a9fa4e26f6c0ebd9d3da72bf69de1d552d 100644 (file)
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -618,7 +618,7 @@ out_unlock:
 void
 handle_percpu_irq(unsigned int irq, struct irq_desc *desc)
 {
-       struct irq_chip *chip = get_irq_desc_chip(desc);
+       struct irq_chip *chip = irq_desc_get_chip(desc);
 
        kstat_incr_irqs_this_cpu(irq, desc);
 
@@ -685,7 +685,7 @@ void
 set_irq_chip_and_handler(unsigned int irq, struct irq_chip *chip,
                         irq_flow_handler_t handle)
 {
-       set_irq_chip(irq, chip);
+       irq_set_chip(irq, chip);
        __set_irq_handler(irq, handle, 0, NULL);
 }
 
@@ -693,7 +693,7 @@ void
 set_irq_chip_and_handler_name(unsigned int irq, struct irq_chip *chip,
                              irq_flow_handler_t handle, const char *name)
 {
-       set_irq_chip(irq, chip);
+       irq_set_chip(irq, chip);
        __set_irq_handler(irq, handle, 0, name);
 }
 

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 78a566a9b39f77087cb7729f9ce651aeaad7532d..dd4e5c21b9e7c3513783cc8b797160510eb59cf4 100644 (file)
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -260,7 +260,7 @@ EXPORT_SYMBOL_GPL(irq_set_affinity_notifier);
 static int
 setup_affinity(unsigned int irq, struct irq_desc *desc, struct cpumask *mask)
 {
-       struct irq_chip *chip = get_irq_desc_chip(desc);
+       struct irq_chip *chip = irq_desc_get_chip(desc);
        struct cpumask *set = irq_default_affinity;
        int ret;