[PATCH] [omap2] Fix compiler warnings in gpmc.c

[PATCH] [omap2] Fix compiler warnings in gpmc.c

[Sanjeev Premi]

Fix these compiler warnings:

gpmc.c: In function 'gpmc_init':
gpmc.c:432: warning: 'return' with a value, in function returning void
gpmc.c:439: warning: 'return' with a value, in function returning void

Signed-off-by: Sanjeev Premi <premi@ti.com>
---
 arch/arm/mach-omap2/gpmc.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index f3e0271..4365c59 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -429,18 +429,16 @@ void __init gpmc_init(void)
 	gpmc_l3_clk = clk_get(NULL, ck);
 	if (IS_ERR(gpmc_l3_clk)) {
 		printk(KERN_ERR "Could not get GPMC clock %s\n", ck);
-		return -ENODEV;
+		BUG();
 	}
 
 	gpmc_base = ioremap(l, SZ_4K);
 	if (!gpmc_base) {
 		clk_put(gpmc_l3_clk);
 		printk(KERN_ERR "Could not get GPMC register memory\n");
-		return -ENOMEM;
+		BUG();
 	}
 
-	BUG_ON(IS_ERR(gpmc_l3_clk));
-
 	l = gpmc_read_reg(GPMC_REVISION);
 	printk(KERN_INFO "GPMC revision %d.%d\n", (l >> 4) & 0x0f, l & 0x0f);
 	/* Set smart idle mode and automatic L3 clock gating */
-- 
1.5.6

Re: [PATCH] [omap2] Fix compiler warnings in gpmc.c

[Tony Lindgren]

* Sanjeev Premi <premi@ti.com> [081010 13:22]:
> Fix these compiler warnings:
> 
> gpmc.c: In function 'gpmc_init':
> gpmc.c:432: warning: 'return' with a value, in function returning void
> gpmc.c:439: warning: 'return' with a value, in function returning void

Pushing.

Tony

> Signed-off-by: Sanjeev Premi <premi@ti.com>
> ---
>  arch/arm/mach-omap2/gpmc.c |    6 ++----
>  1 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
> index f3e0271..4365c59 100644
> --- a/arch/arm/mach-omap2/gpmc.c
> +++ b/arch/arm/mach-omap2/gpmc.c
> @@ -429,18 +429,16 @@ void __init gpmc_init(void)
>  	gpmc_l3_clk = clk_get(NULL, ck);
>  	if (IS_ERR(gpmc_l3_clk)) {
>  		printk(KERN_ERR "Could not get GPMC clock %s\n", ck);
> -		return -ENODEV;
> +		BUG();
>  	}
>  
>  	gpmc_base = ioremap(l, SZ_4K);
>  	if (!gpmc_base) {
>  		clk_put(gpmc_l3_clk);
>  		printk(KERN_ERR "Could not get GPMC register memory\n");
> -		return -ENOMEM;
> +		BUG();
>  	}
>  
> -	BUG_ON(IS_ERR(gpmc_l3_clk));
> -
>  	l = gpmc_read_reg(GPMC_REVISION);
>  	printk(KERN_INFO "GPMC revision %d.%d\n", (l >> 4) & 0x0f, l & 0x0f);
>  	/* Set smart idle mode and automatic L3 clock gating */
> -- 
> 1.5.6
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH] [omap2] Fix compiler warnings in gpmc.c

[Pakaravoor, Jagadeesh]

What was wrong with this patch?

http://marc.info/?l=linux-omap&m=122277286326989&w=2

--
Jagadeesh

Re: [PATCH] [omap2] Fix compiler warnings in gpmc.c

[Tony Lindgren]

* Pakaravoor, Jagadeesh <j-pakaravoor@ti.com> [081010 17:58]:
> 
> What was wrong with this patch?
> 
> http://marc.info/?l=linux-omap&m=122277286326989&w=2

Hmm, looks like I forgot again we already had a patch for that, sorry :)
I'll take a better look on Tuesday.

Tony

Re: [PATCH] [omap2] Fix compiler warnings in gpmc.c

[Tony Lindgren]

* Tony Lindgren <tony@atomide.com> [081012 18:25]:
> * Pakaravoor, Jagadeesh <j-pakaravoor@ti.com> [081010 17:58]:
> > 
> > What was wrong with this patch?
> > 
> > http://marc.info/?l=linux-omap&m=122277286326989&w=2
> 
> Hmm, looks like I forgot again we already had a patch for that, sorry :)
> I'll take a better look on Tuesday.

Hmm, looks like your's is missing clk_put(), so let's keep what I
already pushed.

Cheers,

Tony