include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / arch / arm / mach-pnx4008 / pm.c

diff --git a/arch/arm/mach-pnx4008/pm.c b/arch/arm/mach-pnx4008/pm.c
index 3649cd3..ee3c29c 100644 (file)
--- a/arch/arm/mach-pnx4008/pm.c
+++ b/arch/arm/mach-pnx4008/pm.c
@@ -15,15 +15,17 @@
 #include <linux/rtc.h>
 #include <linux/sched.h>
 #include <linux/proc_fs.h>
-#include <linux/pm.h>
+#include <linux/suspend.h>
 #include <linux/delay.h>
 #include <linux/clk.h>
+#include <linux/io.h>
+#include <linux/slab.h>
 
-#include <asm/io.h>
-#include <asm/mach-types.h>
 #include <asm/cacheflush.h>
-#include <asm/arch/pm.h>
-#include <asm/arch/clock.h>
+
+#include <mach/hardware.h>
+#include <mach/pm.h>
+#include <mach/clock.h>
 
 #define SRAM_VA IO_ADDRESS(PNX4008_IRAM_BASE)
 
@@ -107,50 +109,19 @@ static int pnx4008_pm_enter(suspend_state_t state)
        case PM_SUSPEND_MEM:
                pnx4008_suspend();
                break;
-       case PM_SUSPEND_DISK:
-               return -ENOTSUPP;
-       default:
-               return -EINVAL;
-       }
-       return 0;
-}
-
-/*
- * Called after processes are frozen, but before we shut down devices.
- */
-static int pnx4008_pm_prepare(suspend_state_t state)
-{
-       switch (state) {
-       case PM_SUSPEND_STANDBY:
-       case PM_SUSPEND_MEM:
-               break;
-
-       case PM_SUSPEND_DISK:
-               return -ENOTSUPP;
-               break;
-
-       default:
-               return -EINVAL;
-               break;
        }
        return 0;
 }
 
-/*
- * Called after devices are re-setup, but before processes are thawed.
- */
-static int pnx4008_pm_finish(suspend_state_t state)
+static int pnx4008_pm_valid(suspend_state_t state)
 {
-       return 0;
+       return (state == PM_SUSPEND_STANDBY) ||
+              (state == PM_SUSPEND_MEM);
 }
 
-/*
- * Set to PM_DISK_FIRMWARE so we can quickly veto suspend-to-disk.
- */
-static struct pm_ops pnx4008_pm_ops = {
-       .prepare = pnx4008_pm_prepare,
+static struct platform_suspend_ops pnx4008_pm_ops = {
        .enter = pnx4008_pm_enter,
-       .finish = pnx4008_pm_finish,
+       .valid = pnx4008_pm_valid,
 };
 
 static int __init pnx4008_pm_init(void)
@@ -177,7 +148,7 @@ static int __init pnx4008_pm_init(void)
                return -ENOMEM;
        }
 
-       pm_set_ops(&pnx4008_pm_ops);
+       suspend_set_ops(&pnx4008_pm_ops);
        return 0;
 }