2 files changed, 6 insertions, 34 deletions

diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 8db38dd247a4..3bf01e28df33 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -599,27 +599,15 @@ static void (*saved_idle)(void) = NULL;
 
 /*
  *      omap_pm_prepare - Do preliminary suspend work.
- *      @state:         suspend state we're entering.
  *
  */
-static int omap_pm_prepare(suspend_state_t state)
+static int omap_pm_prepare(void)
 {
-        int error = 0;
-
         /* We cannot sleep in idle until we have resumed */
         saved_idle = pm_idle;
         pm_idle = NULL;
 
-        switch (state)
-        {
-        case PM_SUSPEND_STANDBY:
-        case PM_SUSPEND_MEM:
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        return error;
+        return 0;
 }
 
 
@@ -647,16 +635,14 @@ static int omap_pm_enter(suspend_state_t state)
 
 /**
  *      omap_pm_finish - Finish up suspend sequence.
- *      @state:         State we're coming out of.
  *
  *      This is called after we wake back up (or if entering the sleep state
  *      failed).
  */
 
-static int omap_pm_finish(suspend_state_t state)
+static void omap_pm_finish(void)
 {
         pm_idle = saved_idle;
-        return 0;
 }
 
 
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index 9aaa7a2633e8..baf7d82b458b 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -70,25 +70,12 @@ void omap2_pm_idle(void)
         local_irq_enable();
 }
 
-static int omap2_pm_prepare(suspend_state_t state)
+static int omap2_pm_prepare(void)
 {
-        int error = 0;
-
         /* We cannot sleep in idle until we have resumed */
         saved_idle = pm_idle;
         pm_idle = NULL;
-
-        switch (state)
-        {
-        case PM_SUSPEND_STANDBY:
-        case PM_SUSPEND_MEM:
-                break;
-
-        default:
-                return -EINVAL;
-        }
-
-        return error;
+        return 0;
 }
 
 #define INT0_WAKE_MASK  (OMAP_IRQ_BIT(INT_24XX_GPIO_BANK1) |    \
@@ -356,10 +343,9 @@ static int omap2_pm_enter(suspend_state_t state)
         return ret;
 }
 
-static int omap2_pm_finish(suspend_state_t state)
+static void omap2_pm_finish(void)
 {
         pm_idle = saved_idle;
-        return 0;
 }
 
 static struct platform_suspend_ops omap_pm_ops = {