aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2010-11-08 06:48:00 +0000
committerTony Lindgren <tony@atomide.com>2010-11-08 16:45:28 -0800
commitdfcccd3aaba15e4e8ffae65fb2a757b3e49470de (patch)
tree7bbb150d07a1d809c497ef5efca366af200c1c9f
parentOMAP1: camera.h: add missing include (diff)
downloadlinux-dev-dfcccd3aaba15e4e8ffae65fb2a757b3e49470de.tar.xz
linux-dev-dfcccd3aaba15e4e8ffae65fb2a757b3e49470de.zip
arm: omap1: devices: need to return with a value
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> Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/mach-omap1/devices.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index ea0d80a89da7..e7f9ee63dce5 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