From: Bryan Wu Date: Mon, 21 May 2007 10:09:37 +0000 (+0800) Subject: Blackfin arch: update pm.c according to power management API change. X-Git-Tag: v2.6.22-rc3~128 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d7b6677ac35fdfee93e8f50589e04bcc95649c1;p=linux-2.6 Blackfin arch: update pm.c according to power management API change. Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds --- diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c index deb27272c6..afed5246dd 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,