Re: [PATCH 29/37] powerpc: mpc5121_ads_cpld: remove use of NO_IRQ_IGNORE
From: Grant Likely <hidden>
Date: 2011-05-11 19:07:54
On Wed, May 11, 2011 at 7:30 AM, Milton Miller [off-list ref] wrote:
As NO_IRQ_IGNORE is only used between the static function cpld_pic_get_ir=
q
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 <redacted>
Acked-by: Grant Likely <redacted>
quoted hunk ↗ jump to hunk
--- --- =A0arch/powerpc/platforms/512x/mpc5121_ads_cpld.c | =A0 =A06 +++--- =A01 files changed, 3 insertions(+), 3 deletions(-)diff --git a/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c b/arch/powerp=
c/platforms/512x/mpc5121_ads_cpld.c
quoted hunk ↗ jump to hunk
index a8bc0d4..9f09319 100644--- a/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c +++ b/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c@@ -97,7 +97,7 @@ cpld_pic_get_irq(int offset, u8 ignore, u8 __iomem *sta=
tusp,
quoted hunk ↗ jump to hunk
=A0 =A0 =A0 =A0status |=3D (ignore | mask); =A0 =A0 =A0 =A0if (status =3D=3D 0xff) - =A0 =A0 =A0 =A0 =A0 =A0 =A0 return NO_IRQ_IGNORE; + =A0 =A0 =A0 =A0 =A0 =A0 =A0 return NO_IRQ; =A0 =A0 =A0 =A0cpld_irq =3D ffz(status) + offset;@@ -109,14 +109,14 @@ cpld_pic_cascade(unsigned int irq, struct irq_desc =
*desc)
=A0{
=A0 =A0 =A0 =A0irq =3D cpld_pic_get_irq(0, PCI_IGNORE, &cpld_regs->pci_st=atus,
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&cpld_regs->pci_mask);
- =A0 =A0 =A0 if (irq !=3D NO_IRQ && irq !=3D NO_IRQ_IGNORE) {
+ =A0 =A0 =A0 if (irq !=3D NO_IRQ) {
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0generic_handle_irq(irq);
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return;
=A0 =A0 =A0 =A0}
=A0 =A0 =A0 =A0irq =3D cpld_pic_get_irq(8, MISC_IGNORE, &cpld_regs->misc_=status,
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0&cpld_regs->misc_mask);
- =A0 =A0 =A0 if (irq !=3D NO_IRQ && irq !=3D NO_IRQ_IGNORE) {
+ =A0 =A0 =A0 if (irq !=3D NO_IRQ) {
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0generic_handle_irq(irq);
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return;
=A0 =A0 =A0 =A0}
--
1.7.0.4
--=20 Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd.