diff options
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 deb27272c65..afed5246dd9 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) | |||
102 | switch (state) { | 102 | switch (state) { |
103 | case PM_SUSPEND_STANDBY: | 103 | case PM_SUSPEND_STANDBY: |
104 | break; | 104 | break; |
105 | case PM_SUSPEND_MEM: | ||
106 | return -ENOTSUPP; | ||
107 | 105 | ||
108 | case PM_SUSPEND_DISK: | 106 | case PM_SUSPEND_MEM: |
109 | return -ENOTSUPP; | 107 | return -ENOTSUPP; |
110 | 108 | ||
111 | default: | 109 | default: |
@@ -126,10 +124,8 @@ static int bfin_pm_enter(suspend_state_t state) | |||
126 | case PM_SUSPEND_STANDBY: | 124 | case PM_SUSPEND_STANDBY: |
127 | bfin_pm_suspend_standby_enter(); | 125 | bfin_pm_suspend_standby_enter(); |
128 | break; | 126 | break; |
129 | case PM_SUSPEND_MEM: | ||
130 | return -ENOTSUPP; | ||
131 | 127 | ||
132 | case PM_SUSPEND_DISK: | 128 | case PM_SUSPEND_MEM: |
133 | return -ENOTSUPP; | 129 | return -ENOTSUPP; |
134 | 130 | ||
135 | default: | 131 | default: |
@@ -155,9 +151,6 @@ static int bfin_pm_finish(suspend_state_t state) | |||
155 | case PM_SUSPEND_MEM: | 151 | case PM_SUSPEND_MEM: |
156 | return -ENOTSUPP; | 152 | return -ENOTSUPP; |
157 | 153 | ||
158 | case PM_SUSPEND_DISK: | ||
159 | return -ENOTSUPP; | ||
160 | |||
161 | default: | 154 | default: |
162 | return -EINVAL; | 155 | return -EINVAL; |
163 | } | 156 | } |
@@ -166,7 +159,6 @@ static int bfin_pm_finish(suspend_state_t state) | |||
166 | } | 159 | } |
167 | 160 | ||
168 | struct pm_ops bfin_pm_ops = { | 161 | struct pm_ops bfin_pm_ops = { |
169 | .pm_disk_mode = PM_DISK_PLATFORM, | ||
170 | .prepare = bfin_pm_prepare, | 162 | .prepare = bfin_pm_prepare, |
171 | .enter = bfin_pm_enter, | 163 | .enter = bfin_pm_enter, |
172 | .finish = bfin_pm_finish, | 164 | .finish = bfin_pm_finish, |