diff options
Diffstat (limited to 'arch/x86/kernel/apm_32.c')
-rw-r--r-- | arch/x86/kernel/apm_32.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index e4ea362e8480..bf9290e29013 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c | |||
@@ -1192,19 +1192,6 @@ static int suspend(int vetoable) | |||
1192 | int err; | 1192 | int err; |
1193 | struct apm_user *as; | 1193 | struct apm_user *as; |
1194 | 1194 | ||
1195 | if (pm_send_all(PM_SUSPEND, (void *)3)) { | ||
1196 | /* Vetoed */ | ||
1197 | if (vetoable) { | ||
1198 | if (apm_info.connection_version > 0x100) | ||
1199 | set_system_power_state(APM_STATE_REJECT); | ||
1200 | err = -EBUSY; | ||
1201 | ignore_sys_suspend = 0; | ||
1202 | printk(KERN_WARNING "apm: suspend was vetoed.\n"); | ||
1203 | goto out; | ||
1204 | } | ||
1205 | printk(KERN_CRIT "apm: suspend was vetoed, but suspending anyway.\n"); | ||
1206 | } | ||
1207 | |||
1208 | device_suspend(PMSG_SUSPEND); | 1195 | device_suspend(PMSG_SUSPEND); |
1209 | local_irq_disable(); | 1196 | local_irq_disable(); |
1210 | device_power_down(PMSG_SUSPEND); | 1197 | device_power_down(PMSG_SUSPEND); |
@@ -1227,9 +1214,7 @@ static int suspend(int vetoable) | |||
1227 | device_power_up(); | 1214 | device_power_up(); |
1228 | local_irq_enable(); | 1215 | local_irq_enable(); |
1229 | device_resume(); | 1216 | device_resume(); |
1230 | pm_send_all(PM_RESUME, (void *)0); | ||
1231 | queue_event(APM_NORMAL_RESUME, NULL); | 1217 | queue_event(APM_NORMAL_RESUME, NULL); |
1232 | out: | ||
1233 | spin_lock(&user_list_lock); | 1218 | spin_lock(&user_list_lock); |
1234 | for (as = user_list; as != NULL; as = as->next) { | 1219 | for (as = user_list; as != NULL; as = as->next) { |
1235 | as->suspend_wait = 0; | 1220 | as->suspend_wait = 0; |
@@ -1340,7 +1325,6 @@ static void check_events(void) | |||
1340 | if ((event != APM_NORMAL_RESUME) | 1325 | if ((event != APM_NORMAL_RESUME) |
1341 | || (ignore_normal_resume == 0)) { | 1326 | || (ignore_normal_resume == 0)) { |
1342 | device_resume(); | 1327 | device_resume(); |
1343 | pm_send_all(PM_RESUME, (void *)0); | ||
1344 | queue_event(event, NULL); | 1328 | queue_event(event, NULL); |
1345 | } | 1329 | } |
1346 | ignore_normal_resume = 0; | 1330 | ignore_normal_resume = 0; |