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>
This commit is contained in:
@@ -1189,19 +1189,6 @@ static int suspend(int vetoable)
|
||||
int err;
|
||||
struct apm_user *as;
|
||||
|
||||
if (pm_send_all(PM_SUSPEND, (void *)3)) {
|
||||
/* Vetoed */
|
||||
if (vetoable) {
|
||||
if (apm_info.connection_version > 0x100)
|
||||
set_system_power_state(APM_STATE_REJECT);
|
||||
err = -EBUSY;
|
||||
ignore_sys_suspend = 0;
|
||||
printk(KERN_WARNING "apm: suspend was vetoed.\n");
|
||||
goto out;
|
||||
}
|
||||
printk(KERN_CRIT "apm: suspend was vetoed, but suspending anyway.\n");
|
||||
}
|
||||
|
||||
device_suspend(PMSG_SUSPEND);
|
||||
local_irq_disable();
|
||||
device_power_down(PMSG_SUSPEND);
|
||||
@@ -1224,7 +1211,6 @@ static int suspend(int vetoable)
|
||||
device_power_up();
|
||||
local_irq_enable();
|
||||
device_resume();
|
||||
pm_send_all(PM_RESUME, (void *)0);
|
||||
queue_event(APM_NORMAL_RESUME, NULL);
|
||||
out:
|
||||
spin_lock(&user_list_lock);
|
||||
@@ -1337,7 +1323,6 @@ static void check_events(void)
|
||||
if ((event != APM_NORMAL_RESUME)
|
||||
|| (ignore_normal_resume == 0)) {
|
||||
device_resume();
|
||||
pm_send_all(PM_RESUME, (void *)0);
|
||||
queue_event(event, NULL);
|
||||
}
|
||||
ignore_normal_resume = 0;
|
||||
|
Reference in New Issue
Block a user