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

Commit c42385cd authored by Milton Miller's avatar Milton Miller Committed by Benjamin Herrenschmidt
Browse files

powerpc/mpc5121_ads_cpld: Remove use of NO_IRQ_IGNORE 



As NO_IRQ_IGNORE is only used between the static function cpld_pic_get_irq
and its caller cpld_pic_cascade, and cpld_pic_cascade only uses it to
suppress calling handle_generic_irq, we can change these uses to NO_IRQ
and remove the extra tests and pathlength in cpld_pic_cascade.

Signed-off-by: default avatarMilton Miller <miltonm@bga.com>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent d1921bcd

arch/powerpc/platforms/512x/mpc5121_ads_cpld.c

+3 −3
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ cpld_pic_get_irq(int offset, u8 ignore, u8 __iomem *statusp, 
	status |= (ignore | mask);



	if (status == 0xff)

		return NO_IRQ_IGNORE;

		return NO_IRQ;



	cpld_irq = ffz(status) + offset;
@@ -109,14 +109,14 @@ cpld_pic_cascade(unsigned int irq, struct irq_desc *desc) 
{

	irq = cpld_pic_get_irq(0, PCI_IGNORE, &cpld_regs->pci_status,

		&cpld_regs->pci_mask);

	if (irq != NO_IRQ && irq != NO_IRQ_IGNORE) {

	if (irq != NO_IRQ) {

		generic_handle_irq(irq);

		return;

	}



	irq = cpld_pic_get_irq(8, MISC_IGNORE, &cpld_regs->misc_status,

		&cpld_regs->misc_mask);

	if (irq != NO_IRQ && irq != NO_IRQ_IGNORE) {

	if (irq != NO_IRQ) {

		generic_handle_irq(irq);

		return;

	}