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, 10 insertions, 10 deletions

diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c
index 92e6fbc43a14..f2f4029e21a0 100644
--- a/drivers/mfd/ezx-pcap.c
+++ b/drivers/mfd/ezx-pcap.c
@@ -207,7 +207,7 @@ static void pcap_isr_work(struct work_struct *work)
 
 static void pcap_irq_handler(unsigned int irq, struct irq_desc *desc)
 {
-        struct pcap_chip *pcap = get_irq_data(irq);
+        struct pcap_chip *pcap = irq_get_handler_data(irq);
 
         desc->irq_data.chip->irq_ack(&desc->irq_data);
         queue_work(pcap->workqueue, &pcap->isr_work);
@@ -411,7 +411,7 @@ static int __devexit ezx_pcap_remove(struct spi_device *spi)
 
         /* cleanup irqchip */
         for (i = pcap->irq_base; i < (pcap->irq_base + PCAP_NIRQS); i++)
-                set_irq_chip_and_handler(i, NULL, NULL);
+                irq_set_chip_and_handler(i, NULL, NULL);
 
         destroy_workqueue(pcap->workqueue);
 
@@ -468,12 +468,12 @@ static int __devinit ezx_pcap_probe(struct spi_device *spi)
 
         /* setup irq chip */
         for (i = pcap->irq_base; i < (pcap->irq_base + PCAP_NIRQS); i++) {
-                set_irq_chip_and_handler(i, &pcap_irq_chip, handle_simple_irq);
-                set_irq_chip_data(i, pcap);
+                irq_set_chip_and_handler(i, &pcap_irq_chip, handle_simple_irq);
+                irq_set_chip_data(i, pcap);
 #ifdef CONFIG_ARM
                 set_irq_flags(i, IRQF_VALID);
 #else
-                set_irq_noprobe(i);
+                irq_set_noprobe(i);
 #endif
         }
 
@@ -482,10 +482,10 @@ static int __devinit ezx_pcap_probe(struct spi_device *spi)
         ezx_pcap_write(pcap, PCAP_REG_ISR, PCAP_CLEAR_INTERRUPT_REGISTER);
         pcap->msr = PCAP_MASK_ALL_INTERRUPT;
 
-        set_irq_type(spi->irq, IRQ_TYPE_EDGE_RISING);
-        set_irq_data(spi->irq, pcap);
-        set_irq_chained_handler(spi->irq, pcap_irq_handler);
-        set_irq_wake(spi->irq, 1);
+        irq_set_irq_type(spi->irq, IRQ_TYPE_EDGE_RISING);
+        irq_set_handler_data(spi->irq, pcap);
+        irq_set_chained_handler(spi->irq, pcap_irq_handler);
+        irq_set_irq_wake(spi->irq, 1);
 
         /* ADC */
         adc_irq = pcap_to_irq(pcap, (pdata->config & PCAP_SECOND_PORT) ?
@@ -514,7 +514,7 @@ remove_subdevs:
         free_irq(adc_irq, pcap);
 free_irqchip:
         for (i = pcap->irq_base; i < (pcap->irq_base + PCAP_NIRQS); i++)
-                set_irq_chip_and_handler(i, NULL, NULL);
+                irq_set_chip_and_handler(i, NULL, NULL);
 /* destroy_workqueue: */
         destroy_workqueue(pcap->workqueue);
 free_pcap: