From: Simon Horman <horms@verge.net.au> To: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Cc: vinod.koul@intel.com, dan.j.williams@intel.com, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org Subject: Re: [PATCH 1/2] rcar-hpbdma: remove shdma_free_irq() calls Date: Thu, 26 Sep 2013 02:14:17 +0000 [thread overview] Message-ID: <20130926021417.GC18396@verge.net.au> (raw) In-Reply-To: <201309260228.37765.sergei.shtylyov@cogentembedded.com> On Thu, Sep 26, 2013 at 02:28:37AM +0400, Sergei Shtylyov wrote: > Commit c1c63a14f4f2419d093acd7164eccdff315baa86 (DMA: shdma: switch to managed > resource allocation) got rid of shdma_free_irq() but unfortunately got merged > later than commit c4f6c41ba790bbbfcebb4c47a709ac8ff1fe1af9 (dma: add driver for > R-Car HPB-DMAC), so that the HPB-DMAC driver retained the calls and got broken: > > drivers/dma/sh/rcar-hpbdma.c: In function `hpb_dmae_alloc_chan_resources': > drivers/dma/sh/rcar-hpbdma.c:435: error: implicit declaration of function > `shdma_free_irq' > > Fix this compilation error by removing the remaining shdma_free_irq() calls. Tested-by: Simon Horman <horms+renesas@verge.net.au> > Reported-by: Simon Horman <horms@verge.net.au> > Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> > > --- > The patch is against 'fixes-3.12' branch of Vinod Koul's 'slave-dma.git' repo. > > drivers/dma/sh/rcar-hpbdma.c | 2 -- > 1 file changed, 2 deletions(-) > > Index: slave-dma/drivers/dma/sh/rcar-hpbdma.c > =================================> --- slave-dma.orig/drivers/dma/sh/rcar-hpbdma.c > +++ slave-dma/drivers/dma/sh/rcar-hpbdma.c > @@ -432,7 +432,6 @@ hpb_dmae_alloc_chan_resources(struct hpb > hpb_chan->xfer_mode = XFER_DOUBLE; > } else { > dev_err(hpb_chan->shdma_chan.dev, "DCR setting error"); > - shdma_free_irq(&hpb_chan->shdma_chan); > return -EINVAL; > } > > @@ -614,7 +613,6 @@ static void hpb_dmae_chan_remove(struct > shdma_for_each_chan(schan, &hpbdev->shdma_dev, i) { > BUG_ON(!schan); > > - shdma_free_irq(schan); > shdma_chan_remove(schan); > } > dma_dev->chancnt = 0; >
WARNING: multiple messages have this Message-ID (diff)
From: Simon Horman <horms@verge.net.au> To: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Cc: vinod.koul@intel.com, dan.j.williams@intel.com, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org Subject: Re: [PATCH 1/2] rcar-hpbdma: remove shdma_free_irq() calls Date: Thu, 26 Sep 2013 11:14:17 +0900 [thread overview] Message-ID: <20130926021417.GC18396@verge.net.au> (raw) In-Reply-To: <201309260228.37765.sergei.shtylyov@cogentembedded.com> On Thu, Sep 26, 2013 at 02:28:37AM +0400, Sergei Shtylyov wrote: > Commit c1c63a14f4f2419d093acd7164eccdff315baa86 (DMA: shdma: switch to managed > resource allocation) got rid of shdma_free_irq() but unfortunately got merged > later than commit c4f6c41ba790bbbfcebb4c47a709ac8ff1fe1af9 (dma: add driver for > R-Car HPB-DMAC), so that the HPB-DMAC driver retained the calls and got broken: > > drivers/dma/sh/rcar-hpbdma.c: In function `hpb_dmae_alloc_chan_resources': > drivers/dma/sh/rcar-hpbdma.c:435: error: implicit declaration of function > `shdma_free_irq' > > Fix this compilation error by removing the remaining shdma_free_irq() calls. Tested-by: Simon Horman <horms+renesas@verge.net.au> > Reported-by: Simon Horman <horms@verge.net.au> > Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> > > --- > The patch is against 'fixes-3.12' branch of Vinod Koul's 'slave-dma.git' repo. > > drivers/dma/sh/rcar-hpbdma.c | 2 -- > 1 file changed, 2 deletions(-) > > Index: slave-dma/drivers/dma/sh/rcar-hpbdma.c > =================================================================== > --- slave-dma.orig/drivers/dma/sh/rcar-hpbdma.c > +++ slave-dma/drivers/dma/sh/rcar-hpbdma.c > @@ -432,7 +432,6 @@ hpb_dmae_alloc_chan_resources(struct hpb > hpb_chan->xfer_mode = XFER_DOUBLE; > } else { > dev_err(hpb_chan->shdma_chan.dev, "DCR setting error"); > - shdma_free_irq(&hpb_chan->shdma_chan); > return -EINVAL; > } > > @@ -614,7 +613,6 @@ static void hpb_dmae_chan_remove(struct > shdma_for_each_chan(schan, &hpbdev->shdma_dev, i) { > BUG_ON(!schan); > > - shdma_free_irq(schan); > shdma_chan_remove(schan); > } > dma_dev->chancnt = 0; >
next prev parent reply other threads:[~2013-09-26 2:14 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-09-25 22:28 [PATCH 1/2] rcar-hpbdma: remove shdma_free_irq() calls Sergei Shtylyov 2013-09-25 22:28 ` Sergei Shtylyov 2013-09-26 2:14 ` Simon Horman [this message] 2013-09-26 2:14 ` Simon Horman 2013-10-03 4:00 ` Simon Horman 2013-10-03 4:00 ` Simon Horman 2013-10-09 17:15 ` Sergei Shtylyov 2013-10-09 18:13 ` Sergei Shtylyov 2013-10-11 1:55 ` Vinod Koul 2013-10-11 2:07 ` Vinod Koul 2013-10-15 0:42 ` Simon Horman 2013-10-15 0:42 ` Simon Horman
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20130926021417.GC18396@verge.net.au \ --to=horms@verge.net.au \ --cc=dan.j.williams@intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-sh@vger.kernel.org \ --cc=sergei.shtylyov@cogentembedded.com \ --cc=vinod.koul@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.