From mboxrd@z Thu Jan 1 00:00:00 1970 From: Grant Likely Subject: Re: [PATCH 1/4] block: xsysace: Don't use NO_IRQ Date: Mon, 2 Jan 2012 01:21:04 -0700 Message-ID: <20120102082104.GC18381@ponder.secretlab.ca> References: <1324477932-19262-1-git-send-email-monstr@monstr.eu> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Rob Herring , Ryan Mallon To: Michal Simek Return-path: Content-Disposition: inline In-Reply-To: <1324477932-19262-1-git-send-email-monstr-pSz03upnqPeHXe+LvDLADg@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Sender: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org List-Id: netdev.vger.kernel.org On Wed, Dec 21, 2011 at 03:32:09PM +0100, Michal Simek wrote: > Drivers shouldn't use NO_IRQ. Microblaze and PPC > define NO_IRQ as 0 and this reference will be removed > in near future. > > Signed-off-by: Michal Simek > CC: Grant Likely > CC: Rob Herring > CC: Ryan Mallon Acked-by: Grant Likely > --- > drivers/block/xsysace.c | 10 +++++----- > 1 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c > index fb1975d..1a17e33 100644 > --- a/drivers/block/xsysace.c > +++ b/drivers/block/xsysace.c > @@ -456,7 +456,7 @@ static inline void ace_fsm_yieldirq(struct ace_device *ace) > { > dev_dbg(ace->dev, "ace_fsm_yieldirq()\n"); > > - if (ace->irq == NO_IRQ) > + if (!ace->irq) > /* No IRQ assigned, so need to poll */ > tasklet_schedule(&ace->fsm_tasklet); > ace->fsm_continue_flag = 0; > @@ -1034,12 +1034,12 @@ static int __devinit ace_setup(struct ace_device *ace) > ACE_CTRL_DATABUFRDYIRQ | ACE_CTRL_ERRORIRQ); > > /* Now we can hook up the irq handler */ > - if (ace->irq != NO_IRQ) { > + if (ace->irq) { > rc = request_irq(ace->irq, ace_interrupt, 0, "systemace", ace); > if (rc) { > /* Failure - fall back to polled mode */ > dev_err(ace->dev, "request_irq failed\n"); > - ace->irq = NO_IRQ; > + ace->irq = 0; > } > } > > @@ -1086,7 +1086,7 @@ static void __devexit ace_teardown(struct ace_device *ace) > > tasklet_kill(&ace->fsm_tasklet); > > - if (ace->irq != NO_IRQ) > + if (ace->irq) > free_irq(ace->irq, ace); > > iounmap(ace->baseaddr); > @@ -1156,7 +1156,7 @@ static int __devinit ace_probe(struct platform_device *dev) > resource_size_t physaddr = 0; > int bus_width = ACE_BUS_WIDTH_16; /* FIXME: should not be hard coded */ > u32 id = dev->id; > - int irq = NO_IRQ; > + int irq = 0; > int i; > > dev_dbg(&dev->dev, "ace_probe(%p)\n", dev); > -- > 1.7.5.4 >