diff mbox

[2/4] arm: plat-s3c24xx: dma: drop return codes in void function

Message ID 1310033919-4245-3-git-send-email-w.sang@pengutronix.de (mailing list archive)
State New, archived
Headers show

Commit Message

Wolfram Sang July 7, 2011, 10:18 a.m. UTC
Commit bb072c3c (ARM / Samsung: Use struct syscore_ops for "core" power
management) turned s3c2410_dma_resume_chan() from int to void. So, drop
the actual return values, too. Fixes:

arch/arm/plat-s3c24xx/dma.c: In function 's3c2410_dma_resume_chan':
arch/arm/plat-s3c24xx/dma.c:1238:3: warning: 'return' with a value, in function returning void
arch/arm/plat-s3c24xx/dma.c:1250:2: warning: 'return' with a value, in function returning void

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Kukjin Kim <kgene.kim@samsung.com>
---
 arch/arm/plat-s3c24xx/dma.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

Comments

Rafael Wysocki July 7, 2011, 7:51 p.m. UTC | #1
On Thursday, July 07, 2011, Wolfram Sang wrote:
> Commit bb072c3c (ARM / Samsung: Use struct syscore_ops for "core" power
> management) turned s3c2410_dma_resume_chan() from int to void. So, drop
> the actual return values, too. Fixes:
> 
> arch/arm/plat-s3c24xx/dma.c: In function 's3c2410_dma_resume_chan':
> arch/arm/plat-s3c24xx/dma.c:1238:3: warning: 'return' with a value, in function returning void
> arch/arm/plat-s3c24xx/dma.c:1250:2: warning: 'return' with a value, in function returning void
> 
> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>

Acked-by: Rafael J. Wysocki <rjw@sisk.pl>

> Cc: Kukjin Kim <kgene.kim@samsung.com>
> ---
>  arch/arm/plat-s3c24xx/dma.c |    4 +---
>  1 files changed, 1 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c
> index a5b3684..a79a8cc 100644
> --- a/arch/arm/plat-s3c24xx/dma.c
> +++ b/arch/arm/plat-s3c24xx/dma.c
> @@ -1231,7 +1231,7 @@ static void s3c2410_dma_resume_chan(struct s3c2410_dma_chan *cp)
>  	/* restore channel's hardware configuration */
>  
>  	if (!cp->in_use)
> -		return 0;
> +		return;
>  
>  	printk(KERN_INFO "dma%d: restoring configuration\n", cp->number);
>  
> @@ -1242,8 +1242,6 @@ static void s3c2410_dma_resume_chan(struct s3c2410_dma_chan *cp)
>  
>  	if (cp->map != NULL)
>  		dma_sel.select(cp, cp->map);
> -
> -	return 0;
>  }
>  
>  static void s3c2410_dma_resume(void)
>
Kim Kukjin July 8, 2011, 5:37 a.m. UTC | #2
Rafael J. Wysocki wrote:
> 
> On Thursday, July 07, 2011, Wolfram Sang wrote:
> > Commit bb072c3c (ARM / Samsung: Use struct syscore_ops for "core" power
> > management) turned s3c2410_dma_resume_chan() from int to void. So, drop
> > the actual return values, too. Fixes:
> >
> > arch/arm/plat-s3c24xx/dma.c: In function 's3c2410_dma_resume_chan':
> > arch/arm/plat-s3c24xx/dma.c:1238:3: warning: 'return' with a value, in
function
> returning void
> > arch/arm/plat-s3c24xx/dma.c:1250:2: warning: 'return' with a value, in
function
> returning void
> >
> > Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
> 
> Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
> 

Will apply this into -fix tree for 3.0.
Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.


> > Cc: Kukjin Kim <kgene.kim@samsung.com>
> > ---
> >  arch/arm/plat-s3c24xx/dma.c |    4 +---
> >  1 files changed, 1 insertions(+), 3 deletions(-)
> >
> > diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c
> > index a5b3684..a79a8cc 100644
> > --- a/arch/arm/plat-s3c24xx/dma.c
> > +++ b/arch/arm/plat-s3c24xx/dma.c
> > @@ -1231,7 +1231,7 @@ static void s3c2410_dma_resume_chan(struct
> s3c2410_dma_chan *cp)
> >  	/* restore channel's hardware configuration */
> >
> >  	if (!cp->in_use)
> > -		return 0;
> > +		return;
> >
> >  	printk(KERN_INFO "dma%d: restoring configuration\n", cp->number);
> >
> > @@ -1242,8 +1242,6 @@ static void s3c2410_dma_resume_chan(struct
> s3c2410_dma_chan *cp)
> >
> >  	if (cp->map != NULL)
> >  		dma_sel.select(cp, cp->map);
> > -
> > -	return 0;
> >  }
> >
> >  static void s3c2410_dma_resume(void)
> >
diff mbox

Patch

diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c
index a5b3684..a79a8cc 100644
--- a/arch/arm/plat-s3c24xx/dma.c
+++ b/arch/arm/plat-s3c24xx/dma.c
@@ -1231,7 +1231,7 @@  static void s3c2410_dma_resume_chan(struct s3c2410_dma_chan *cp)
 	/* restore channel's hardware configuration */
 
 	if (!cp->in_use)
-		return 0;
+		return;
 
 	printk(KERN_INFO "dma%d: restoring configuration\n", cp->number);
 
@@ -1242,8 +1242,6 @@  static void s3c2410_dma_resume_chan(struct s3c2410_dma_chan *cp)
 
 	if (cp->map != NULL)
 		dma_sel.select(cp, cp->map);
-
-	return 0;
 }
 
 static void s3c2410_dma_resume(void)