[PATCH 29/32] Blackfin arch: update pm.c according to power management API change.

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Bryan Wu
Date: Monday, May 21, 2007 - 3:09 am

Signed-off-by: Bryan Wu <bryan.wu@analog.com>
---
 arch/blackfin/mach-common/pm.c |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c
index deb2727..afed524 100644
--- 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,
-- 
1.5.1.2
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 00/32] Blackfin update for 2.6.22-rc2, Bryan Wu, (Mon May 21, 3:09 am)
[PATCH 29/32] Blackfin arch: update pm.c according to powe ..., Bryan Wu, (Mon May 21, 3:09 am)
Re: [PATCH 00/32] Blackfin update for 2.6.22-rc2, Robin Getz, (Mon May 21, 7:35 am)
Re: [PATCH 00/32] Blackfin update for 2.6.22-rc2, Paul Mundt, (Mon May 21, 7:37 am)
Re: [PATCH 00/32] Blackfin update for 2.6.22-rc2, Mike Frysinger, (Mon May 21, 10:36 am)
Re: [PATCH 00/32] Blackfin update for 2.6.22-rc2, Robin Getz, (Mon May 21, 2:52 pm)
Re: [PATCH 00/32] Blackfin update for 2.6.22-rc2, Mike Frysinger, (Mon May 21, 3:01 pm)
Re: [PATCH 00/32] Blackfin update for 2.6.22-rc2, Bryan Wu, (Tue May 22, 1:37 am)
Re: [PATCH 00/32] Blackfin update for 2.6.22-rc2, Mike Frysinger, (Tue May 22, 5:28 pm)
Re: [PATCH 00/32] Blackfin update for 2.6.22-rc2, Paul Mundt, (Tue May 22, 6:06 pm)