diff options
| author | Bryan Wu <bryan.wu@analog.com> | 2007-05-21 12:09:37 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 18:50:23 +0200 |
| commit | 9d7b6677ac35fdfee93e8f50589e04bcc95649c1 (patch) | |
| tree | 8a7e5c60a0a490cd8549b5474e6ded82cb12847e /arch/blackfin | |
| parent | Blackfin arch: update defconfig files (diff) | |
| download | linux-9d7b6677ac35fdfee93e8f50589e04bcc95649c1.tar.xz linux-9d7b6677ac35fdfee93e8f50589e04bcc95649c1.zip | |
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>
Diffstat (limited to 'arch/blackfin')
| -rw-r--r-- | 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 deb27272c658..afed5246dd9e 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, |