openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Milton Miller <miltonm@bga.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Milton Miller 2011-05-10 19:30:15 +00:00 committed by Benjamin Herrenschmidt
parent d1921bcdee
commit c42385cd45
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/platforms/512x/mpc5121_ads_cpld.c
View File

@ -97,7 +97,7 @@ cpld_pic_get_irq(int offset, u8 ignore, u8 __iomem *statusp,
status |= (ignore | mask); status |= (ignore | mask);
if (status == 0xff) if (status == 0xff)
return NO_IRQ_IGNORE; return NO_IRQ;
cpld_irq = ffz(status) + offset; 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, irq = cpld_pic_get_irq(0, PCI_IGNORE, &cpld_regs->pci_status,
&cpld_regs->pci_mask); &cpld_regs->pci_mask);
if (irq != NO_IRQ && irq != NO_IRQ_IGNORE) { if (irq != NO_IRQ) {
generic_handle_irq(irq); generic_handle_irq(irq);
return; return;
} }
irq = cpld_pic_get_irq(8, MISC_IGNORE, &cpld_regs->misc_status, irq = cpld_pic_get_irq(8, MISC_IGNORE, &cpld_regs->misc_status,
&cpld_regs->misc_mask); &cpld_regs->misc_mask);
if (irq != NO_IRQ && irq != NO_IRQ_IGNORE) { if (irq != NO_IRQ) {
generic_handle_irq(irq); generic_handle_irq(irq);
return; return;
} }