Skip to content

Commit

Permalink
powerpc/mpc5121_ads_cpld: Remove use of NO_IRQ_IGNORE
Browse files Browse the repository at this point in the history
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: Milton Miller <miltonm@bga.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  • Loading branch information
Milton Miller authored and Benjamin Herrenschmidt committed May 19, 2011
1 parent d1921bc commit c42385c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/powerpc/platforms/512x/mpc5121_ads_cpld.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
}
Expand Down

0 comments on commit c42385c

Please sign in to comment.