fix sparse, checkpatch warnings in OMAP2/3 PRCM/PM code

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / prcm.c

diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c
index c1b4cc5505d48a221f8963cae38d2b0298052dba..0d2a99a44df6b20fbe3c73041357082d5bd9af5c 100644 (file)
--- a/arch/arm/mach-omap2/prcm.c
+++ b/arch/arm/mach-omap2/prcm.c
@@ -18,11 +18,12 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 
+#include <asm/arch/prcm.h>
+
+#include "clock.h"
 #include "prm.h"
 #include "prm-regbits-24xx.h"
 
-extern void omap2_clk_prepare_for_reboot(void);
-
 u32 omap_prcm_get_reset_sources(void)
 {
        /* XXX This presumably needs modification for 34XX */
@@ -36,13 +37,12 @@ void omap_prcm_arch_reset(char mode)
        s16 prcm_offs;
        omap2_clk_prepare_for_reboot();
 
-       if (cpu_is_omap24xx()) {
+       if (cpu_is_omap24xx())
                prcm_offs = WKUP_MOD;
-       } else if (cpu_is_omap34xx()) {
+       else if (cpu_is_omap34xx())
                prcm_offs = OMAP3430_GR_MOD;
-       } else {
+       else
                WARN_ON(1);
-       }
 
        prm_set_mod_reg_bits(OMAP_RST_DPLL3, prcm_offs, RM_RSTCTRL);
 }