Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+10 -16
+1 -1
drivers/mfd/db8500-prcmu.c
··· 2364 2364 2365 2365 for (n = 0; n < NUM_PRCMU_WAKEUPS; n++) { 2366 2366 if (ev & prcmu_irq_bit[n]) 2367 - generic_handle_irq(irq_find_mapping(db8500_irq_domain, n)); 2367 + generic_handle_domain_irq(db8500_irq_domain, n); 2368 2368 } 2369 2369 r = true; 2370 2370 break;
+2 -2
drivers/mfd/fsl-imx25-tsadc.c
··· 35 35 regmap_read(tsadc->regs, MX25_TSC_TGSR, &status); 36 36 37 37 if (status & MX25_TGSR_GCQ_INT) 38 - generic_handle_irq(irq_find_mapping(tsadc->domain, 1)); 38 + generic_handle_domain_irq(tsadc->domain, 1); 39 39 40 40 if (status & MX25_TGSR_TCQ_INT) 41 - generic_handle_irq(irq_find_mapping(tsadc->domain, 0)); 41 + generic_handle_domain_irq(tsadc->domain, 0); 42 42 43 43 chained_irq_exit(chip, desc); 44 44 }
+3 -7
drivers/mfd/ioc3.c
··· 105 105 struct ioc3_priv_data *ipd = domain->host_data; 106 106 struct ioc3 __iomem *regs = ipd->regs; 107 107 u32 pending, mask; 108 - unsigned int irq; 109 108 110 109 pending = readl(&regs->sio_ir); 111 110 mask = readl(&regs->sio_ies); 112 111 pending &= mask; /* Mask off not enabled interrupts */ 113 112 114 - if (pending) { 115 - irq = irq_find_mapping(domain, __ffs(pending)); 116 - if (irq) 117 - generic_handle_irq(irq); 118 - } else { 113 + if (pending) 114 + generic_handle_domain_irq(domain, __ffs(pending)); 115 + else 119 116 spurious_interrupt(); 120 - } 121 117 } 122 118 123 119 /*
+4 -6
drivers/mfd/qcom-pm8xxx.c
··· 122 122 123 123 static int pm8xxx_irq_block_handler(struct pm_irq_chip *chip, int block) 124 124 { 125 - int pmirq, irq, i, ret = 0; 125 + int pmirq, i, ret = 0; 126 126 unsigned int bits; 127 127 128 128 ret = pm8xxx_read_block_irq(chip, block, &bits); ··· 139 139 for (i = 0; i < 8; i++) { 140 140 if (bits & (1 << i)) { 141 141 pmirq = block * 8 + i; 142 - irq = irq_find_mapping(chip->irqdomain, pmirq); 143 - generic_handle_irq(irq); 142 + generic_handle_domain_irq(chip->irqdomain, pmirq); 144 143 } 145 144 } 146 145 return 0; ··· 198 199 static void pm8821_irq_block_handler(struct pm_irq_chip *chip, 199 200 int master, int block) 200 201 { 201 - int pmirq, irq, i, ret; 202 + int pmirq, i, ret; 202 203 unsigned int bits; 203 204 204 205 ret = regmap_read(chip->regmap, ··· 215 216 for (i = 0; i < 8; i++) { 216 217 if (bits & BIT(i)) { 217 218 pmirq = block * 8 + i; 218 - irq = irq_find_mapping(chip->irqdomain, pmirq); 219 - generic_handle_irq(irq); 219 + generic_handle_domain_irq(chip->irqdomain, pmirq); 220 220 } 221 221 } 222 222 }