diff options
author | Nishanth Menon <nm@ti.com> | 2011-01-06 22:49:29 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-01-06 22:58:28 -0500 |
commit | a9b365bdc328bd66e97087d0dba0b9a3d9eb1ac6 (patch) | |
tree | 5983a58771d95e0e916a3ee9a93f756b947d9f52 /arch/arm/mach-omap2 | |
parent | 2393608aede2380afc3fa8815197363f01f328ad (diff) |
omap2+: wdt: trivial sparse fixes
omap2_wd_timer_disable is declared in wdtimer.h and used by hwmod
function pointers for usage, the header inclusion is necessary
to ensure that the prototype and function remains consistent.
omap_wdt_latency is passed as a pointer and does not need global scope
Fixes sparse warnings:
arch/arm/mach-omap2/devices.c:981:31: warning: symbol 'omap_wdt_latency' was not declared. Should it be static?
arch/arm/mach-omap2/wd_timer.c:27:5: warning: symbol 'omap2_wd_timer_disable' was not declared. Should it be static?
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/devices.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/wd_timer.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 381f4eb92352..2c9c912f2c42 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
@@ -978,7 +978,7 @@ static int __init omap2_init_devices(void) | |||
978 | arch_initcall(omap2_init_devices); | 978 | arch_initcall(omap2_init_devices); |
979 | 979 | ||
980 | #if defined(CONFIG_OMAP_WATCHDOG) || defined(CONFIG_OMAP_WATCHDOG_MODULE) | 980 | #if defined(CONFIG_OMAP_WATCHDOG) || defined(CONFIG_OMAP_WATCHDOG_MODULE) |
981 | struct omap_device_pm_latency omap_wdt_latency[] = { | 981 | static struct omap_device_pm_latency omap_wdt_latency[] = { |
982 | [0] = { | 982 | [0] = { |
983 | .deactivate_func = omap_device_idle_hwmods, | 983 | .deactivate_func = omap_device_idle_hwmods, |
984 | .activate_func = omap_device_enable_hwmods, | 984 | .activate_func = omap_device_enable_hwmods, |
diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c index b0c4907ab3ca..4067669d96c4 100644 --- a/arch/arm/mach-omap2/wd_timer.c +++ b/arch/arm/mach-omap2/wd_timer.c | |||
@@ -13,6 +13,8 @@ | |||
13 | 13 | ||
14 | #include <plat/omap_hwmod.h> | 14 | #include <plat/omap_hwmod.h> |
15 | 15 | ||
16 | #include "wd_timer.h" | ||
17 | |||
16 | /* | 18 | /* |
17 | * In order to avoid any assumptions from bootloader regarding WDT | 19 | * In order to avoid any assumptions from bootloader regarding WDT |
18 | * settings, WDT module is reset during init. This enables the watchdog | 20 | * settings, WDT module is reset during init. This enables the watchdog |