Blackfin arch: update pm.c according to power management API change.

Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c
index deb27272c658d643d202337279b877c2424af8d2..afed5246dd9ea159685f245caa0813dc951777b8 100644 (file)
--- a/arch/blackfin/mach-common/pm.c
+++ b/arch/blackfin/mach-common/pm.c
@@ -102,10 +102,8 @@ static int bfin_pm_prepare(suspend_state_t state)
        switch (state) {
        case PM_SUSPEND_STANDBY:
                break;
-       case PM_SUSPEND_MEM:
-               return -ENOTSUPP;
 
-       case PM_SUSPEND_DISK:
+       case PM_SUSPEND_MEM:
                return -ENOTSUPP;
 
        default:
@@ -126,10 +124,8 @@ static int bfin_pm_enter(suspend_state_t state)
        case PM_SUSPEND_STANDBY:
                bfin_pm_suspend_standby_enter();
                break;
-       case PM_SUSPEND_MEM:
-               return -ENOTSUPP;
 
-       case PM_SUSPEND_DISK:
+       case PM_SUSPEND_MEM:
                return -ENOTSUPP;
 
        default:
@@ -155,9 +151,6 @@ static int bfin_pm_finish(suspend_state_t state)
        case PM_SUSPEND_MEM:
                return -ENOTSUPP;
 
-       case PM_SUSPEND_DISK:
-               return -ENOTSUPP;
-
        default:
                return -EINVAL;
        }
@@ -166,7 +159,6 @@ static int bfin_pm_finish(suspend_state_t state)
 }
 
 struct pm_ops bfin_pm_ops = {
-       .pm_disk_mode = PM_DISK_PLATFORM,
        .prepare = bfin_pm_prepare,
        .enter = bfin_pm_enter,
        .finish = bfin_pm_finish,