diff options
author | Kevin Hilman <khilman@deeprootsystems.com> | 2010-02-24 14:05:56 -0500 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2010-02-24 14:05:56 -0500 |
commit | 0cc9314eaf82ecf9914ad2c845574ed5e63c0374 (patch) | |
tree | 35d4dc8c5ff43dd2ddb03bec0aa1020093b48ec1 /arch | |
parent | a51ba284076437ce36efc8dd9b15983546c043f7 (diff) |
OMAP2/3: PRCM: fix misc. compiler warnings
- missing return in omap_prcm_get_reset_sources()
- potential use of uninitialized variable in omap_prcm_arch_reset()
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/prcm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c index 0f87fdce02a9..356a02010aae 100644 --- a/arch/arm/mach-omap2/prcm.c +++ b/arch/arm/mach-omap2/prcm.c | |||
@@ -127,13 +127,15 @@ u32 omap_prcm_get_reset_sources(void) | |||
127 | return prm_read_mod_reg(WKUP_MOD, OMAP2_RM_RSTST) & 0x7f; | 127 | return prm_read_mod_reg(WKUP_MOD, OMAP2_RM_RSTST) & 0x7f; |
128 | if (cpu_is_omap44xx()) | 128 | if (cpu_is_omap44xx()) |
129 | return prm_read_mod_reg(WKUP_MOD, OMAP4_RM_RSTST) & 0x7f; | 129 | return prm_read_mod_reg(WKUP_MOD, OMAP4_RM_RSTST) & 0x7f; |
130 | |||
131 | return 0; | ||
130 | } | 132 | } |
131 | EXPORT_SYMBOL(omap_prcm_get_reset_sources); | 133 | EXPORT_SYMBOL(omap_prcm_get_reset_sources); |
132 | 134 | ||
133 | /* Resets clock rates and reboots the system. Only called from system.h */ | 135 | /* Resets clock rates and reboots the system. Only called from system.h */ |
134 | void omap_prcm_arch_reset(char mode) | 136 | void omap_prcm_arch_reset(char mode) |
135 | { | 137 | { |
136 | s16 prcm_offs; | 138 | s16 prcm_offs = 0; |
137 | 139 | ||
138 | if (cpu_is_omap24xx()) { | 140 | if (cpu_is_omap24xx()) { |
139 | omap2xxx_clk_prepare_for_reboot(); | 141 | omap2xxx_clk_prepare_for_reboot(); |