1 files changed, 10 insertions, 9 deletions

diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c
index df60eabaf49e..3e238cd049e6 100644
--- a/drivers/irqchip/irq-armada-370-xp.c
+++ b/drivers/irqchip/irq-armada-370-xp.c
@@ -387,13 +387,15 @@ static void armada_370_xp_handle_msi_irq(struct pt_regs *regs, bool is_chained)
                 if (!(msimask & BIT(msinr)))
                         continue;
 
-                irq = irq_find_mapping(armada_370_xp_msi_domain,
-                                       msinr - 16);
-
-                if (is_chained)
+                if (is_chained) {
+                        irq = irq_find_mapping(armada_370_xp_msi_domain,
+                                               msinr - 16);
                         generic_handle_irq(irq);
-                else
-                        handle_IRQ(irq, regs);
+                } else {
+                        irq = msinr - 16;
+                        handle_domain_irq(armada_370_xp_msi_domain,
+                                          irq, regs);
+                }
         }
 }
 #else
@@ -438,9 +440,8 @@ armada_370_xp_handle_irq(struct pt_regs *regs)
                         break;
 
                 if (irqnr > 1) {
-                        irqnr = irq_find_mapping(armada_370_xp_mpic_domain,
-                                        irqnr);
-                        handle_IRQ(irqnr, regs);
+                        handle_domain_irq(armada_370_xp_mpic_domain,
+                                          irqnr, regs);
                         continue;
                 }