diff mbox

[1/1] dmaengine: s3c24xx-dma: use DMA_COMPLETE for dma completion status

Message ID 1383196690-28307-1-git-send-email-sachin.kamat@linaro.org (mailing list archive)
State Accepted
Commit 415612c1caab50f60797f06ad016ef602f0503cb
Delegated to: Vinod Koul
Headers show

Commit Message

Sachin Kamat Oct. 31, 2013, 5:18 a.m. UTC
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)

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(-)

Comments

Vinod Koul Oct. 31, 2013, 1:42 p.m. UTC | #1
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>

--
~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
>
Heiko Stuebner Oct. 31, 2013, 3 p.m. UTC | #2
Am Donnerstag, 31. Oktober 2013, 06:18:09 schrieb Sachin Kamat:
> 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)
> 
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>

thanks for the catch!

Acked-by: Heiko Stuebner <heiko@sntech.de>


> 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;
>  	}

--
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
kgene@kernel.org Nov. 12, 2013, 10:28 a.m. UTC | #3
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 :-)

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
Vinod Koul Nov. 13, 2013, 8:58 a.m. UTC | #4
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
Vinod Koul Nov. 28, 2013, 7:25 a.m. UTC | #5
On Wed, Nov 13, 2013 at 02:28:58PM +0530, Vinod Koul wrote:
> 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
Applied now,

Thanks
--
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
Dan Williams Nov. 28, 2013, 10:33 p.m. UTC | #6
On Wed, Nov 27, 2013 at 11:25 PM, Vinod Koul <vinod.koul@intel.com> wrote:
> On Wed, Nov 13, 2013 at 02:28:58PM +0530, Vinod Koul wrote:
>> 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
> Applied now,
>

This driver also missed the unmap rework.  Fixing now.

Vinod, I'll send you the pile after I finish my build regression suite.

--
Dan
--
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
Vinod Koul Nov. 29, 2013, 5:11 a.m. UTC | #7
On Thu, Nov 28, 2013 at 02:33:22PM -0800, Dan Williams wrote:
> On Wed, Nov 27, 2013 at 11:25 PM, Vinod Koul <vinod.koul@intel.com> wrote:
> > On Wed, Nov 13, 2013 at 02:28:58PM +0530, Vinod Koul wrote:
> >> 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
> > Applied now,
> >
> 
> This driver also missed the unmap rework.  Fixing now.
yup, this is a new driver and got merged thru samsung tree

> Vinod, I'll send you the pile after I finish my build regression suite.
sure, i think these should go into fixes

--
~Vinod
--
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
diff mbox

Patch

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;
 	}