@@ -333,16 +333,10 @@ static void rockchip_irq_demux(struct irq_desc *desc)
pend = readl_relaxed(bank->reg_base + bank->gpio_regs->int_status);
while (pend) {
- unsigned int irq, virq;
+ unsigned int irq;
irq = __ffs(pend);
pend &= ~BIT(irq);
- virq = irq_find_mapping(bank->domain, irq);
-
- if (!virq) {
- dev_err(bank->dev, "unmapped irq %d\n", irq);
- continue;
- }
dev_dbg(bank->dev, "handling irq %d\n", irq);
@@ -377,7 +371,7 @@ static void rockchip_irq_demux(struct irq_desc *desc)
} while ((data & BIT(irq)) != (data_old & BIT(irq)));
}
- generic_handle_irq(virq);
+ generic_handle_domain_irq(bank->domain, irq);
}
chained_irq_exit(chip, desc);
Follow commit dbd1c54fc820 ("gpio: Bulk conversion to generic_handle_domain_irq()"). Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> --- drivers/gpio/gpio-rockchip.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)