Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[pandora-kernel.git] / arch / arm / mach-omap2 / pm44xx.c

diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c
index dc8b1ef..76cfff2 100644 (file)
--- a/arch/arm/mach-omap2/pm44xx.c
+++ b/arch/arm/mach-omap2/pm44xx.c
@@ -16,7 +16,7 @@
 #include <linux/err.h>
 #include <linux/slab.h>
 
-#include <plat/powerdomain.h>
+#include "powerdomain.h"
 #include <mach/omap4-common.h>
 
 struct power_state {
@@ -31,12 +31,6 @@ struct power_state {
 static LIST_HEAD(pwrst_list);
 
 #ifdef CONFIG_SUSPEND
-static int omap4_pm_prepare(void)
-{
-       disable_hlt();
-       return 0;
-}
-
 static int omap4_pm_suspend(void)
 {
        do_wfi();
@@ -59,28 +53,22 @@ static int omap4_pm_enter(suspend_state_t suspend_state)
        return ret;
 }
 
-static void omap4_pm_finish(void)
-{
-       enable_hlt();
-       return;
-}
-
 static int omap4_pm_begin(suspend_state_t state)
 {
+       disable_hlt();
        return 0;
 }
 
 static void omap4_pm_end(void)
 {
+       enable_hlt();
        return;
 }
 
 static const struct platform_suspend_ops omap_pm_ops = {
        .begin          = omap4_pm_begin,
        .end            = omap4_pm_end,
-       .prepare        = omap4_pm_prepare,
        .enter          = omap4_pm_enter,
-       .finish         = omap4_pm_finish,
        .valid          = suspend_valid_only_mem,
 };
 #endif /* CONFIG_SUSPEND */