From: Vinod Koul <vinod.koul@intel.com>
To: Kukjin Kim <kgene@kernel.org>
Cc: 'Sachin Kamat' <sachin.kamat@linaro.org>,
dmaengine@vger.kernel.org, linux-samsung-soc@vger.kernel.org,
dan.j.williams@intel.com, 'Heiko Stuebner' <heiko@sntech.de>
Subject: Re: [PATCH 1/1] dmaengine: s3c24xx-dma: use DMA_COMPLETE for dma completion status
Date: Wed, 13 Nov 2013 14:28:58 +0530 [thread overview]
Message-ID: <20131113085858.GS8834@intel.com> (raw)
In-Reply-To: <086101cedf91$e2a1ce70$a7e56b50$@org>
On Tue, Nov 12, 2013 at 07:28:10PM +0900, Kukjin Kim wrote:
> Vinod Koul wrote:
> >
> > On Thu, Oct 31, 2013 at 10:48:09AM +0530, Sachin Kamat wrote:
> > > Use the recently introduced DMA_COMPLETE instead of DMA_SUCCESS.
> > > Without this patch we get the following build error:
> > > drivers/dma/s3c24xx-dma.c: In function ‘s3c24xx_dma_tx_status’:
> > > drivers/dma/s3c24xx-dma.c:798:13: error: ‘DMA_SUCCESS’ undeclared
> > > (first use in this function)
> > I missed it because this is not in my tree! This needs to go thru kgene's
> > tree
> > and for that you can merge dma_complete branch from my tree. I will not
> > rebase
> > that
> >
> > Acked-by: Vinod Koul <vinod.koul@intel.com>
> >
>
> Oops, I missed :(
>
> Vinod, since the s3c24xx-dma is in Linus' tree now, you can go ahead with my ack into your fixes.
>
> If you want me to take this into samsung tree, let me know :-)
Okay, I will apply this after merge window
--
~Vinod
>
> Thanks,
> Kukjin
>
> > --
> > ~Vinod
> > >
> > > Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> > > Cc: Heiko Stuebner <heiko@sntech.de>
> > > Cc: Vinod Koul <vinod.koul@intel.com>
> > > ---
> > > drivers/dma/s3c24xx-dma.c | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/dma/s3c24xx-dma.c b/drivers/dma/s3c24xx-dma.c
> > > index 4cb127978636..085da4fe6613 100644
> > > --- a/drivers/dma/s3c24xx-dma.c
> > > +++ b/drivers/dma/s3c24xx-dma.c
> > > @@ -795,7 +795,7 @@ static enum dma_status s3c24xx_dma_tx_status(struct
> > dma_chan *chan,
> > >
> > > spin_lock_irqsave(&s3cchan->vc.lock, flags);
> > > ret = dma_cookie_status(chan, cookie, txstate);
> > > - if (ret == DMA_SUCCESS) {
> > > + if (ret == DMA_COMPLETE) {
> > > spin_unlock_irqrestore(&s3cchan->vc.lock, flags);
> > > return ret;
> > > }
> > > --
> > > 1.7.9.5
> > >
> >
> > --
>
> --
> To unsubscribe from this list: send the line "unsubscribe dmaengine" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
next prev parent reply other threads:[~2013-11-13 9:54 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-31 5:18 [PATCH 1/1] dmaengine: s3c24xx-dma: use DMA_COMPLETE for dma completion status Sachin Kamat
2013-10-31 13:42 ` Vinod Koul
2013-11-12 10:28 ` Kukjin Kim
2013-11-13 8:58 ` Vinod Koul [this message]
2013-11-28 7:25 ` Vinod Koul
2013-11-28 22:33 ` Dan Williams
2013-11-29 5:11 ` Vinod Koul
2013-10-31 15:00 ` Heiko Stübner
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=20131113085858.GS8834@intel.com \
--to=vinod.koul@intel.com \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=heiko@sntech.de \
--cc=kgene@kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=sachin.kamat@linaro.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox