3 files changed, 15 insertions, 30 deletions

diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index e8053d16829b..5cdb4122f057 100644
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -550,15 +550,12 @@ struct locomo_save_data {
         u16     LCM_SPIMD;
 };
 
-static int locomo_suspend(struct device *dev, pm_message_t state, u32 level)
+static int locomo_suspend(struct device *dev, pm_message_t state)
 {
         struct locomo *lchip = dev_get_drvdata(dev);
         struct locomo_save_data *save;
         unsigned long flags;
 
-        if (level != SUSPEND_DISABLE)
-                return 0;
-
         save = kmalloc(sizeof(struct locomo_save_data), GFP_KERNEL);
         if (!save)
                 return -ENOMEM;
@@ -597,16 +594,13 @@ static int locomo_suspend(struct device *dev, pm_message_t state, u32 level)
         return 0;
 }
 
-static int locomo_resume(struct device *dev, u32 level)
+static int locomo_resume(struct device *dev)
 {
         struct locomo *lchip = dev_get_drvdata(dev);
         struct locomo_save_data *save;
         unsigned long r;
         unsigned long flags;
         
-        if (level != RESUME_ENABLE)
-                return 0;
-
         save = (struct locomo_save_data *) dev->power.saved_state;
         if (!save)
                 return 0;
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 1a47fbf9cbbc..21e2a518ad3a 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -801,7 +801,7 @@ struct sa1111_save_data {
 
 #ifdef CONFIG_PM
 
-static int sa1111_suspend(struct device *dev, pm_message_t state, u32 level)
+static int sa1111_suspend(struct device *dev, pm_message_t state)
 {
         struct sa1111 *sachip = dev_get_drvdata(dev);
         struct sa1111_save_data *save;
@@ -809,9 +809,6 @@ static int sa1111_suspend(struct device *dev, pm_message_t state, u32 level)
         unsigned int val;
         void __iomem *base;
 
-        if (level != SUSPEND_DISABLE)
-                return 0;
-
         save = kmalloc(sizeof(struct sa1111_save_data), GFP_KERNEL);
         if (!save)
                 return -ENOMEM;
@@ -856,23 +853,19 @@ static int sa1111_suspend(struct device *dev, pm_message_t state, u32 level)
 /*
  *      sa1111_resume - Restore the SA1111 device state.
  *      @dev: device to restore
- *      @level: resume level
  *
  *      Restore the general state of the SA1111; clock control and
  *      interrupt controller.  Other parts of the SA1111 must be
  *      restored by their respective drivers, and must be called
  *      via LDM after this function.
  */
-static int sa1111_resume(struct device *dev, u32 level)
+static int sa1111_resume(struct device *dev)
 {
         struct sa1111 *sachip = dev_get_drvdata(dev);
         struct sa1111_save_data *save;
         unsigned long flags, id;
         void __iomem *base;
 
-        if (level != RESUME_ENABLE)
-                return 0;
-
         save = (struct sa1111_save_data *)dev->power.saved_state;
         if (!save)
                 return 0;
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c
index 9e5245c702de..e8356b76d7c6 100644
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@ -102,26 +102,24 @@ static void check_scoop_reg(struct scoop_dev *sdev)
 }
 
 #ifdef CONFIG_PM
-static int scoop_suspend(struct device *dev, pm_message_t state, uint32_t level)
+static int scoop_suspend(struct device *dev, pm_message_t state)
 {
-        if (level == SUSPEND_POWER_DOWN) {
-                struct scoop_dev *sdev = dev_get_drvdata(dev);
+        struct scoop_dev *sdev = dev_get_drvdata(dev);
+
+        check_scoop_reg(sdev);
+        sdev->scoop_gpwr = SCOOP_REG(sdev->base, SCOOP_GPWR);
+        SCOOP_REG(sdev->base, SCOOP_GPWR) = (sdev->scoop_gpwr & ~sdev->suspend_clr) | sdev->suspend_set;
 
-                check_scoop_reg(sdev);
-                sdev->scoop_gpwr = SCOOP_REG(sdev->base, SCOOP_GPWR);
-                SCOOP_REG(sdev->base, SCOOP_GPWR) = (sdev->scoop_gpwr & ~sdev->suspend_clr) | sdev->suspend_set;
-        }
         return 0;
 }
 
-static int scoop_resume(struct device *dev, uint32_t level)
+static int scoop_resume(struct device *dev)
 {
-        if (level == RESUME_POWER_ON) {
-                struct scoop_dev *sdev = dev_get_drvdata(dev);
+        struct scoop_dev *sdev = dev_get_drvdata(dev);
+
+        check_scoop_reg(sdev);
+        SCOOP_REG(sdev->base,SCOOP_GPWR) = sdev->scoop_gpwr;
 
-                check_scoop_reg(sdev);
-                SCOOP_REG(sdev->base,SCOOP_GPWR) = sdev->scoop_gpwr;
-        }
         return 0;
 }
 #else