mfd: Bulk conversion to generic_handle_domain_irq()

Wherever possible, replace constructs that match either
generic_handle_irq(irq_find_mapping()) or
generic_handle_irq(irq_linear_revmap()) to a single call to
generic_handle_domain_irq().

Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index 3bde7fda755f1cc735c599453819a04085c7ecf4..287da20f1231b916c0f6f8d0352e674b0072ac3a 100644 (file)
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -2364,7 +2364,7 @@ static bool read_mailbox_0(void)
 
                for (n = 0; n < NUM_PRCMU_WAKEUPS; n++) {
                        if (ev & prcmu_irq_bit[n])
-                               generic_handle_irq(irq_find_mapping(db8500_irq_domain, n));
+                               generic_handle_domain_irq(db8500_irq_domain, n);
                }
                r = true;
                break;

diff --git a/drivers/mfd/fsl-imx25-tsadc.c b/drivers/mfd/fsl-imx25-tsadc.c
index 5f6f0a83e1c55acf4afa55b2e0d7473a13392b55..37e5e02a1d059024ceebf29ed607d362396536e1 100644 (file)
--- a/drivers/mfd/fsl-imx25-tsadc.c
+++ b/drivers/mfd/fsl-imx25-tsadc.c
@@ -35,10 +35,10 @@ static void mx25_tsadc_irq_handler(struct irq_desc *desc)
        regmap_read(tsadc->regs, MX25_TSC_TGSR, &status);
 
        if (status & MX25_TGSR_GCQ_INT)
-               generic_handle_irq(irq_find_mapping(tsadc->domain, 1));
+               generic_handle_domain_irq(tsadc->domain, 1);
 
        if (status & MX25_TGSR_TCQ_INT)
-               generic_handle_irq(irq_find_mapping(tsadc->domain, 0));
+               generic_handle_domain_irq(tsadc->domain, 0);
 
        chained_irq_exit(chip, desc);
 }

diff --git a/drivers/mfd/ioc3.c b/drivers/mfd/ioc3.c
index 99b9c113f9647870d4110e6bb741b3339cc8d51b..58656837b7c6247f70adb2e2522f291c4a39b56c 100644 (file)
--- a/drivers/mfd/ioc3.c
+++ b/drivers/mfd/ioc3.c
@@ -105,19 +105,15 @@ static void ioc3_irq_handler(struct irq_desc *desc)
        struct ioc3_priv_data *ipd = domain->host_data;
        struct ioc3 __iomem *regs = ipd->regs;
        u32 pending, mask;
-       unsigned int irq;
 
        pending = readl(&regs->sio_ir);
        mask = readl(&regs->sio_ies);
        pending &= mask; /* Mask off not enabled interrupts */
 
-       if (pending) {
-               irq = irq_find_mapping(domain, __ffs(pending));
-               if (irq)
-                       generic_handle_irq(irq);
-       } else  {
+       if (pending)
+               generic_handle_domain_irq(domain, __ffs(pending));
+       else
                spurious_interrupt();
-       }
 }
 
 /*

diff --git a/drivers/mfd/qcom-pm8xxx.c b/drivers/mfd/qcom-pm8xxx.c
index acd172ddcbd6ad11848cfa80d0ec5a6f23a652fa..ec18a04de355537cf1ea12db824b57cd6fb1930e 100644 (file)
--- a/drivers/mfd/qcom-pm8xxx.c
+++ b/drivers/mfd/qcom-pm8xxx.c
@@ -122,7 +122,7 @@ bail:
 
 static int pm8xxx_irq_block_handler(struct pm_irq_chip *chip, int block)
 {
-       int pmirq, irq, i, ret = 0;
+       int pmirq, i, ret = 0;
        unsigned int bits;
 
        ret = pm8xxx_read_block_irq(chip, block, &bits);
@@ -139,8 +139,7 @@ static int pm8xxx_irq_block_handler(struct pm_irq_chip *chip, int block)
        for (i = 0; i < 8; i++) {
                if (bits & (1 << i)) {
                        pmirq = block * 8 + i;
-                       irq = irq_find_mapping(chip->irqdomain, pmirq);
-                       generic_handle_irq(irq);
+                       generic_handle_domain_irq(chip->irqdomain, pmirq);
                }
        }
        return 0;
@@ -199,7 +198,7 @@ static void pm8xxx_irq_handler(struct irq_desc *desc)
 static void pm8821_irq_block_handler(struct pm_irq_chip *chip,
                                     int master, int block)
 {
-       int pmirq, irq, i, ret;
+       int pmirq, i, ret;
        unsigned int bits;
 
        ret = regmap_read(chip->regmap,
@@ -216,8 +215,7 @@ static void pm8821_irq_block_handler(struct pm_irq_chip *chip,
        for (i = 0; i < 8; i++) {
                if (bits & BIT(i)) {
                        pmirq = block * 8 + i;
-                       irq = irq_find_mapping(chip->irqdomain, pmirq);
-                       generic_handle_irq(irq);
+                       generic_handle_domain_irq(chip->irqdomain, pmirq);
                }
        }
 }