moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mfd: Bulk conversion to generic_handle_domain_irq()

Browse Source 
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>
This commit is contained in:
Marc Zyngier
2021-05-04 17:42:18 +01:00
parent a9cb09b7be
commit 3b0cccef05
4 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mfd/db8500-prcmu.c
View File

@@ -2364,7 +2364,7 @@ static bool read_mailbox_0(void)
for (n = 0; n < NUM_PRCMU_WAKEUPS; n++) { for (n = 0; n < NUM_PRCMU_WAKEUPS; n++) {
if (ev & prcmu_irq_bit[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; r = true;
break; break;

4
drivers/mfd/fsl-imx25-tsadc.c
View File

@@ -35,10 +35,10 @@ static void mx25_tsadc_irq_handler(struct irq_desc *desc)
regmap_read(tsadc->regs, MX25_TSC_TGSR, &status); regmap_read(tsadc->regs, MX25_TSC_TGSR, &status);
if (status & MX25_TGSR_GCQ_INT) 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) 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); chained_irq_exit(chip, desc);
} }

10
drivers/mfd/ioc3.c
View File

@@ -105,19 +105,15 @@ static void ioc3_irq_handler(struct irq_desc *desc)
struct ioc3_priv_data *ipd = domain->host_data; struct ioc3_priv_data *ipd = domain->host_data;
struct ioc3 __iomem *regs = ipd->regs; struct ioc3 __iomem *regs = ipd->regs;
u32 pending, mask; u32 pending, mask;
unsigned int irq;
pending = readl(&regs->sio_ir); pending = readl(&regs->sio_ir);
mask = readl(&regs->sio_ies); mask = readl(&regs->sio_ies);
pending &= mask; /* Mask off not enabled interrupts */ pending &= mask; /* Mask off not enabled interrupts */
if (pending) { if (pending)
irq = irq_find_mapping(domain, __ffs(pending)); generic_handle_domain_irq(domain, __ffs(pending));
if (irq) else
generic_handle_irq(irq);
} else {
spurious_interrupt(); spurious_interrupt();
}
} }
/* /*

10
drivers/mfd/qcom-pm8xxx.c
View File

@@ -122,7 +122,7 @@ bail:
static int pm8xxx_irq_block_handler(struct pm_irq_chip *chip, int block) 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; unsigned int bits;
ret = pm8xxx_read_block_irq(chip, block, &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++) { for (i = 0; i < 8; i++) {
if (bits & (1 << i)) { if (bits & (1 << i)) {
pmirq = block * 8 + i; pmirq = block * 8 + i;
irq = irq_find_mapping(chip->irqdomain, pmirq); generic_handle_domain_irq(chip->irqdomain, pmirq);
generic_handle_irq(irq);
} }
} }
return 0; 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, static void pm8821_irq_block_handler(struct pm_irq_chip *chip,
int master, int block) int master, int block)
{ {
int pmirq, irq, i, ret; int pmirq, i, ret;
unsigned int bits; unsigned int bits;
ret = regmap_read(chip->regmap, 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++) { for (i = 0; i < 8; i++) {
if (bits & BIT(i)) { if (bits & BIT(i)) {
pmirq = block * 8 + i; pmirq = block * 8 + i;
irq = irq_find_mapping(chip->irqdomain, pmirq); generic_handle_domain_irq(chip->irqdomain, pmirq);
generic_handle_irq(irq);
} }
} }
} }