From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-iw0-f179.google.com (mail-iw0-f179.google.com [209.85.214.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 8BC4EB6F5F for ; Thu, 12 May 2011 05:07:54 +1000 (EST) Received: by iwc10 with SMTP id 10so899366iwc.38 for ; Wed, 11 May 2011 12:07:51 -0700 (PDT) MIME-Version: 1.0 Sender: glikely@secretlab.ca In-Reply-To: References: From: Grant Likely Date: Wed, 11 May 2011 21:07:31 +0200 Message-ID: Subject: Re: [PATCH 29/37] powerpc: mpc5121_ads_cpld: remove use of NO_IRQ_IGNORE To: Milton Miller Content-Type: text/plain; charset=ISO-8859-1 Cc: Thomas Gleixner , linuxppc-dev@lists.ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Wed, May 11, 2011 at 7:30 AM, Milton Miller 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 Acked-by: Grant Likely > --- > --- > =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 > 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, > =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.