mfd: Cleanup irq namespace

Converted with coccinelle.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

1 files changed, 11 insertions, 11 deletions

diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index 652bde5a5adc..22b5a78bbfdb 100644
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -388,21 +388,21 @@ static int __init asic3_irq_probe(struct platform_device *pdev)
 
         for (irq = irq_base; irq < irq_base + ASIC3_NR_IRQS; irq++) {
                 if (irq < asic->irq_base + ASIC3_NUM_GPIOS)
-                        set_irq_chip(irq, &asic3_gpio_irq_chip);
+                        irq_set_chip(irq, &asic3_gpio_irq_chip);
                 else
-                        set_irq_chip(irq, &asic3_irq_chip);
+                        irq_set_chip(irq, &asic3_irq_chip);
 
-                set_irq_chip_data(irq, asic);
-                set_irq_handler(irq, handle_level_irq);
+                irq_set_chip_data(irq, asic);
+                irq_set_handler(irq, handle_level_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
         asic3_write_register(asic, ASIC3_OFFSET(INTR, INT_MASK),
                              ASIC3_INTMASK_GINTMASK);
 
-        set_irq_chained_handler(asic->irq_nr, asic3_irq_demux);
-        set_irq_type(asic->irq_nr, IRQ_TYPE_EDGE_RISING);
-        set_irq_data(asic->irq_nr, asic);
+        irq_set_chained_handler(asic->irq_nr, asic3_irq_demux);
+        irq_set_irq_type(asic->irq_nr, IRQ_TYPE_EDGE_RISING);
+        irq_set_handler_data(asic->irq_nr, asic);
 
         return 0;
 }
@@ -416,11 +416,11 @@ static void asic3_irq_remove(struct platform_device *pdev)
 
         for (irq = irq_base; irq < irq_base + ASIC3_NR_IRQS; irq++) {
                 set_irq_flags(irq, 0);
-                set_irq_handler(irq, NULL);
-                set_irq_chip(irq, NULL);
-                set_irq_chip_data(irq, NULL);
+                irq_set_handler(irq, NULL);
+                irq_set_chip(irq, NULL);
+                irq_set_chip_data(irq, NULL);
         }
-        set_irq_chained_handler(asic->irq_nr, NULL);
+        irq_set_chained_handler(asic->irq_nr, NULL);
 }
 
 /* GPIOs */