Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus

[~andy/linux] / drivers / mfd / ezx-pcap.c

diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c
index 9e2d8dd5f9e53d1d57d0ebbbee5bfedb992068e1..43a76c41cfcc9fe39084dd2967eaba23a4e87a52 100644 (file)
--- a/drivers/mfd/ezx-pcap.c
+++ b/drivers/mfd/ezx-pcap.c
@@ -162,6 +162,7 @@ static void pcap_unmask_irq(struct irq_data *d)
 
 static struct irq_chip pcap_irq_chip = {
        .name           = "pcap",
+       .irq_disable    = pcap_mask_irq,
        .irq_mask       = pcap_mask_irq,
        .irq_unmask     = pcap_unmask_irq,
 };
@@ -184,7 +185,7 @@ static void pcap_isr_work(struct work_struct *work)
                ezx_pcap_read(pcap, PCAP_REG_MSR, &msr);
                ezx_pcap_read(pcap, PCAP_REG_ISR, &isr);
 
-               /* We cant service/ack irqs that are assigned to port 2 */
+               /* We can't service/ack irqs that are assigned to port 2 */
                if (!(pdata->config & PCAP_SECOND_PORT)) {
                        ezx_pcap_read(pcap, PCAP_REG_INT_SEL, &int_sel);
                        isr &= ~int_sel;
@@ -196,17 +197,8 @@ static void pcap_isr_work(struct work_struct *work)
                local_irq_disable();
                service = isr & ~msr;
                for (irq = pcap->irq_base; service; service >>= 1, irq++) {
-                       if (service & 1) {
-                               struct irq_desc *desc = irq_to_desc(irq);
-
-                               if (WARN(!desc, "Invalid PCAP IRQ %d\n", irq))
-                                       break;
-
-                               if (desc->status & IRQ_DISABLED)
-                                       note_interrupt(irq, desc, IRQ_NONE);
-                               else
-                                       desc->handle_irq(irq, desc);
-                       }
+                       if (service & 1)
+                               generic_handle_irq(irq);
                }
                local_irq_enable();
                ezx_pcap_write(pcap, PCAP_REG_MSR, pcap->msr);
@@ -215,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);
@@ -419,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);
 
@@ -465,7 +457,7 @@ static int __devinit ezx_pcap_probe(struct spi_device *spi)
        pcap->workqueue = create_singlethread_workqueue("pcapd");
        if (!pcap->workqueue) {
                ret = -ENOMEM;
-               dev_err(&spi->dev, "cant create pcap thread\n");
+               dev_err(&spi->dev, "can't create pcap thread\n");
                goto free_pcap;
        }
 
@@ -476,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
        }
 
@@ -490,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) ?
@@ -522,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: