Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e89c6a06 authored by Marc Zyngier's avatar Marc Zyngier Committed by Jason Cooper
Browse files

irqchip: armada-370-xp: Convert to handle_domain_irq 



Use the new handle_domain_irq method to handle interrupts.

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Link: https://lkml.kernel.org/r/1409047421-27649-7-git-send-email-marc.zyngier@arm.com


Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 60031b4e

drivers/irqchip/irq-armada-370-xp.c

+10 −9
Original line number Original line Diff line number Diff line
@@ -393,13 +393,15 @@ static void armada_370_xp_handle_msi_irq(struct pt_regs *regs, bool is_chained) 
		if (!(msimask & BIT(msinr)))

		if (!(msimask & BIT(msinr)))

			continue;

			continue;





		if (is_chained) {

			irq = irq_find_mapping(armada_370_xp_msi_domain,

			irq = irq_find_mapping(armada_370_xp_msi_domain,

					       msinr - 16);

					       msinr - 16);



		if (is_chained)

			generic_handle_irq(irq);

			generic_handle_irq(irq);

		else

		} else {

			handle_IRQ(irq, regs);

			irq = msinr - 16;

			handle_domain_irq(armada_370_xp_msi_domain,

					  irq, regs);

		}

	}

	}

}

}

#else

#else
@@ -444,9 +446,8 @@ armada_370_xp_handle_irq(struct pt_regs *regs) 
			break;

			break;





		if (irqnr > 1) {

		if (irqnr > 1) {

			irqnr =	irq_find_mapping(armada_370_xp_mpic_domain,

			handle_domain_irq(armada_370_xp_mpic_domain,

					irqnr);

					  irqnr, regs);

			handle_IRQ(irqnr, regs);

			continue;

			continue;

		}

		}