[PATCH 0/2] Trivial series

[PATCH 0/2] Trivial series

[Felipe Balbi]

Hi Tony,

found these while compiling n770_defconfig. Probably
worth sending to mainline anyway ?

Felipe Balbi (2):
  arm: omap1: devices: need to return with a value
  arm: omap1: remove unused variables

 arch/arm/mach-omap1/devices.c |    2 +-
 arch/arm/mach-omap1/mailbox.c |    1 -
 arch/arm/mach-omap1/pm_bus.c  |    1 -
 3 files changed, 1 insertions(+), 3 deletions(-)

-- 
1.7.3.rc0.35.g8ac8c

[PATCH 1/2] arm: omap1: devices: need to return with a value

[Felipe Balbi]

Get rid of the following warning:

arch/arm/mach-omap1/devices.c: In function 'omap_init_wdt':
arch/arm/mach-omap1/devices.c:298: warning: 'return' with
no value, in function returning non-void

Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 arch/arm/mach-omap1/devices.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index 63d68cf..a037aba 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -295,7 +295,7 @@ static struct platform_device omap_wdt_device = {
 static int __init omap_init_wdt(void)
 {
 	if (!cpu_is_omap16xx())
-		return;
+		return -ENODEV;
 
 	platform_device_register(&omap_wdt_device);
 	return 0;
-- 
1.7.3.rc0.35.g8ac8c

[PATCH 2/2] arm: omap1: remove unused variables

[Felipe Balbi]

Get rid of the following warnings:

arch/arm/mach-omap1/pm_bus.c: In function 'omap1_pm_runtime_resume':
arch/arm/mach-omap1/pm_bus.c:51: warning: unused variable 'ret'
arch/arm/mach-omap1/mailbox.c: In function 'omap1_mbox_probe':
arch/arm/mach-omap1/mailbox.c:148: warning: unused variable 'i'

Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 arch/arm/mach-omap1/mailbox.c |    1 -
 arch/arm/mach-omap1/pm_bus.c  |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap1/mailbox.c b/arch/arm/mach-omap1/mailbox.c
index 1a85a42..1add133 100644
--- a/arch/arm/mach-omap1/mailbox.c
+++ b/arch/arm/mach-omap1/mailbox.c
@@ -145,7 +145,6 @@ static int __devinit omap1_mbox_probe(struct platform_device *pdev)
 {
 	struct resource *mem;
 	int ret;
-	int i;
 	struct omap_mbox **list;
 
 	list = omap1_mboxes;
diff --git a/arch/arm/mach-omap1/pm_bus.c b/arch/arm/mach-omap1/pm_bus.c
index 8b66392..f97c6e9 100644
--- a/arch/arm/mach-omap1/pm_bus.c
+++ b/arch/arm/mach-omap1/pm_bus.c
@@ -48,7 +48,6 @@ static int omap1_pm_runtime_suspend(struct device *dev)
 
 static int omap1_pm_runtime_resume(struct device *dev)
 {
-	int ret = 0;
 	struct clk *iclk, *fclk;
 
 	dev_dbg(dev, "%s\n", __func__);
-- 
1.7.3.rc0.35.g8ac8c

[PATCH 1/2] arm: omap1: devices: need to return with a value

[Uwe Kleine-König]

On Tue, Oct 19, 2010 at 10:30:54AM +0300, Felipe Balbi wrote:
> Get rid of the following warning:
> 
> arch/arm/mach-omap1/devices.c: In function 'omap_init_wdt':
> arch/arm/mach-omap1/devices.c:298: warning: 'return' with
> no value, in function returning non-void
> 
> Signed-off-by: Felipe Balbi <balbi@ti.com>
> ---
>  arch/arm/mach-omap1/devices.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
> index 63d68cf..a037aba 100644
> --- a/arch/arm/mach-omap1/devices.c
> +++ b/arch/arm/mach-omap1/devices.c
> @@ -295,7 +295,7 @@ static struct platform_device omap_wdt_device = {
>  static int __init omap_init_wdt(void)
>  {
>  	if (!cpu_is_omap16xx())
> -		return;
> +		return -ENODEV;
>  
>  	platform_device_register(&omap_wdt_device);
>  	return 0;
It's unrelated to this patch, but using

	return platform_device_register(&omap_wdt_device);

would be a bit cleaner.

Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[PATCH 2/2] arm: omap1: remove unused variables

[Tony Lindgren]

* Felipe Balbi <balbi@ti.com> [101019 00:22]:
> Get rid of the following warnings:
> 
> arch/arm/mach-omap1/pm_bus.c: In function 'omap1_pm_runtime_resume':
> arch/arm/mach-omap1/pm_bus.c:51: warning: unused variable 'ret'
> arch/arm/mach-omap1/mailbox.c: In function 'omap1_mbox_probe':
> arch/arm/mach-omap1/mailbox.c:148: warning: unused variable 'i'

Assuming Hiroshi will queue up this one.

Tony

[PATCH 1/2] arm: omap1: devices: need to return with a value

[Tony Lindgren]

* Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> [101019 00:53]:
> On Tue, Oct 19, 2010 at 10:30:54AM +0300, Felipe Balbi wrote:
> > Get rid of the following warning:
> > 
> > arch/arm/mach-omap1/devices.c: In function 'omap_init_wdt':
> > arch/arm/mach-omap1/devices.c:298: warning: 'return' with
> > no value, in function returning non-void
> > 
> > Signed-off-by: Felipe Balbi <balbi@ti.com>
> > ---
> >  arch/arm/mach-omap1/devices.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
> > index 63d68cf..a037aba 100644
> > --- a/arch/arm/mach-omap1/devices.c
> > +++ b/arch/arm/mach-omap1/devices.c
> > @@ -295,7 +295,7 @@ static struct platform_device omap_wdt_device = {
> >  static int __init omap_init_wdt(void)
> >  {
> >  	if (!cpu_is_omap16xx())
> > -		return;
> > +		return -ENODEV;
> >  
> >  	platform_device_register(&omap_wdt_device);
> >  	return 0;
> It's unrelated to this patch, but using
> 
> 	return platform_device_register(&omap_wdt_device);
> 
> would be a bit cleaner.

Felipe, care to update this one?

Tony

[PATCH] arm: omap1: devices: need to return with a value

[Felipe Balbi]

Get rid of the following warning:

arch/arm/mach-omap1/devices.c: In function 'omap_init_wdt':
arch/arm/mach-omap1/devices.c:298: warning: 'return' with
no value, in function returning non-void

while at that, also change:

platform_device_register();
return 0;

into:

return platform_device_register();

Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 arch/arm/mach-omap1/devices.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index ea0d80a..e7f9ee6 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -321,10 +321,9 @@ static struct platform_device omap_wdt_device = {
 static int __init omap_init_wdt(void)
 {
 	if (!cpu_is_omap16xx())
-		return;
+		return -ENODEV;
 
-	platform_device_register(&omap_wdt_device);
-	return 0;
+	return platform_device_register(&omap_wdt_device);
 }
 subsys_initcall(omap_init_wdt);
 #endif
-- 
1.7.3.2.146.gca209