1
0
Fork 0
alistair23-linux/drivers/acpi
Eric W. Biederman b35c67a46b [PATCH] acpi: Don't call acpi_sleep_prepare from acpi_power_off
Now that all of the code paths that call acpi_power_off
have been modified to call either call kernel_power_off
(which calls apci_sleep_prepare by way of acpi_shutdown)
or to call acpi_sleep_prepare directly it is redundant to call
acpi_sleep_prepare from acpi_power_off.

So simplify the code and simply don't call acpi_sleep_prepare.

In addition there is a little error handling done so if we
can't register the acpi class we don't hook pm_power_off.

I think I have done the right thing with the CONFIG_PM define
but I'm not certain.  Can this code even be compiled if
CONFIG_PM is false?

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-26 14:35:45 -07:00
..
dispatcher ACPICA 20050408 from Bob Moore 2005-07-12 00:08:52 -04:00
events ACPICA 20050408 from Bob Moore 2005-07-12 00:08:52 -04:00
executer ACPICA 20050408 from Bob Moore 2005-07-12 00:08:52 -04:00
hardware ACPICA 20050408 from Bob Moore 2005-07-12 00:08:52 -04:00
namespace [ACPI] fix merge error that broke CONFIG_ACPI_DEBUG=y build 2005-07-12 00:12:09 -04:00
parser ACPICA 20050408 from Bob Moore 2005-07-12 00:08:52 -04:00
resources ACPICA 20050408 from Bob Moore 2005-07-12 00:08:52 -04:00
sleep [PATCH] acpi: Don't call acpi_sleep_prepare from acpi_power_off 2005-07-26 14:35:45 -07:00
tables ACPICA 20050408 from Bob Moore 2005-07-12 00:08:52 -04:00
utilities ACPICA 20050408 from Bob Moore 2005-07-12 00:08:52 -04:00
Kconfig [ACPI] merge acpi-2.6.12 branch into latest Linux 2.6.13-rc... 2005-07-12 17:21:56 -04:00
Makefile [ACPI] Bind PCI devices with ACPI devices 2005-07-11 23:28:24 -04:00
ac.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
acpi_memhotplug.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
asus_acpi.c [ACPI] generic Hot Key support 2005-07-11 23:27:04 -04:00
battery.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
blacklist.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
bus.c [ACPI] pci_set_power_state() now calls 2005-07-11 23:47:06 -04:00
button.c [ACPI] Allow simultaneous Fixed Feature and Control Method buttons 2005-07-11 23:17:07 -04:00
container.c [PATCH] acpi bridge hotadd: Allow ACPI .add and .start operations to be done independently 2005-06-27 21:52:42 -07:00
debug.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ec.c ACPI: delete unnecessary EC console messages 2005-07-23 00:26:33 -04:00
event.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
fan.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
glue.c [ACPI] quiet dmesg related to ACPI PM of PCI devices 2005-07-12 00:09:42 -04:00
hotkey.c [ACPI] fix debug-mode build warning in acpi/hotkey.c 2005-07-11 23:59:34 -04:00
ibm_acpi.c [ACPI] Bind PCI devices with ACPI devices 2005-07-11 23:28:24 -04:00
motherboard.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
numa.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
osl.c [ACPI] generic Hot Key support 2005-07-11 23:27:04 -04:00
pci_bind.c [PATCH] acpi bridge hotadd: Export the interface to get PCI id for an ACPI handle 2005-06-27 21:52:42 -07:00
pci_irq.c If ACPI doesn't find an irq listed, don't accept 0 as a valid PCI irq. 2005-07-02 10:35:33 -07:00
pci_link.c [ACPI] PNPACPI vs sound IRQ 2005-07-12 00:03:30 -04:00
pci_root.c [PATCH] acpi bridge hotadd: ACPI based root bridge hot-add 2005-06-27 21:52:39 -07:00
power.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
processor_core.c [ACPI] merge acpi-2.6.12 branch into latest Linux 2.6.13-rc... 2005-07-12 17:21:56 -04:00
processor_idle.c [ACPI] merge acpi-2.6.12 branch into latest Linux 2.6.13-rc... 2005-07-12 17:21:56 -04:00
processor_perflib.c [ACPI] enable C2 and C3 idle power states on SMP 2005-07-12 00:14:36 -04:00
processor_thermal.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
processor_throttling.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
scan.c [ACPI] merge acpi-2.6.12 branch into latest Linux 2.6.13-rc... 2005-07-12 17:21:56 -04:00
system.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
tables.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
thermal.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
toshiba_acpi.c [ACPI] check for kmalloc failure in toshiba_acpi.c 2005-07-11 23:57:35 -04:00
utils.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
video.c [ACPI] fix kmalloc size bug in acpi/video.c 2005-07-11 23:58:45 -04:00