diff options
author | Pavel Machek <pavel@suse.cz> | 2008-03-13 18:52:49 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-04-15 03:19:07 -0400 |
commit | 6afe1a1fe8ff83f6ac2726b04665e76ba7b14f3e (patch) | |
tree | afb11aefbd33e4fa73b777abdd6ccbb42da36797 /arch/x86 | |
parent | a985aabe4d7a720b109c2b63549f8641676a9c88 (diff) |
PM: Remove legacy PM
AFAICT pm_send_all is a nop when noone uses pm_register...
Hmm.. can we just force CONFIG_PM_LEGACY=n, and see what happens?
Or maybe this is better idea? It may break build somewhere, but it
should be easy to fix... (it builds here, i386 and x86-64).
Signed-off-by: Pavel Machek <pavel@suse.cz>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/apm_32.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index d4438ef296d8..d7e92bfb8f66 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c | |||
@@ -1189,19 +1189,6 @@ static int suspend(int vetoable) | |||
1189 | int err; | 1189 | int err; |
1190 | struct apm_user *as; | 1190 | struct apm_user *as; |
1191 | 1191 | ||
1192 | if (pm_send_all(PM_SUSPEND, (void *)3)) { | ||
1193 | /* Vetoed */ | ||
1194 | if (vetoable) { | ||
1195 | if (apm_info.connection_version > 0x100) | ||
1196 | set_system_power_state(APM_STATE_REJECT); | ||
1197 | err = -EBUSY; | ||
1198 | ignore_sys_suspend = 0; | ||
1199 | printk(KERN_WARNING "apm: suspend was vetoed.\n"); | ||
1200 | goto out; | ||
1201 | } | ||
1202 | printk(KERN_CRIT "apm: suspend was vetoed, but suspending anyway.\n"); | ||
1203 | } | ||
1204 | |||
1205 | device_suspend(PMSG_SUSPEND); | 1192 | device_suspend(PMSG_SUSPEND); |
1206 | local_irq_disable(); | 1193 | local_irq_disable(); |
1207 | device_power_down(PMSG_SUSPEND); | 1194 | device_power_down(PMSG_SUSPEND); |
@@ -1224,7 +1211,6 @@ static int suspend(int vetoable) | |||
1224 | device_power_up(); | 1211 | device_power_up(); |
1225 | local_irq_enable(); | 1212 | local_irq_enable(); |
1226 | device_resume(); | 1213 | device_resume(); |
1227 | pm_send_all(PM_RESUME, (void *)0); | ||
1228 | queue_event(APM_NORMAL_RESUME, NULL); | 1214 | queue_event(APM_NORMAL_RESUME, NULL); |
1229 | out: | 1215 | out: |
1230 | spin_lock(&user_list_lock); | 1216 | spin_lock(&user_list_lock); |
@@ -1337,7 +1323,6 @@ static void check_events(void) | |||
1337 | if ((event != APM_NORMAL_RESUME) | 1323 | if ((event != APM_NORMAL_RESUME) |
1338 | || (ignore_normal_resume == 0)) { | 1324 | || (ignore_normal_resume == 0)) { |
1339 | device_resume(); | 1325 | device_resume(); |
1340 | pm_send_all(PM_RESUME, (void *)0); | ||
1341 | queue_event(event, NULL); | 1326 | queue_event(event, NULL); |
1342 | } | 1327 | } |
1343 | ignore_normal_resume = 0; | 1328 | ignore_normal_resume = 0; |