diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2010-12-11 23:44:39 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 10:48:45 +0100 |
| commit | f6767dcf2a4f6e62960912d0affec1e15a246191 (patch) | |
| tree | 266b6321c882867f5bb183fb6f29d0f1ee064798 | |
| parent | Platform / x86: Make fujitsu_laptop use acpi_bus_update_power() (diff) | |
| download | linux-f6767dcf2a4f6e62960912d0affec1e15a246191.tar.xz linux-f6767dcf2a4f6e62960912d0affec1e15a246191.zip | |
ACPI / PM: Drop acpi_bus_get_power()
There are no more users of acpi_bus_get_power(), so it can be
dropped. Moreover, it should be dropped, because it modifies
the device->power.state field of an ACPI device without updating
the reference counters of the device's power resources, which is
wrong.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | drivers/acpi/bus.c | 19 | ||||
| -rw-r--r-- | include/acpi/acpi_bus.h | 1 |
2 files changed, 0 insertions, 20 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 2ee83b5fff97..0baa5f97734a 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -236,25 +236,6 @@ static int __acpi_bus_get_power(struct acpi_device *device, int *state) } -int acpi_bus_get_power(acpi_handle handle, int *state) -{ - struct acpi_device *device; - int result; - - result = acpi_bus_get_device(handle, &device); - if (result) - return result; - - result = __acpi_bus_get_power(device, state); - if (result) - return result; - - device->power.state = *state; - return 0; -} -EXPORT_SYMBOL(acpi_bus_get_power); - - static int __acpi_bus_set_power(struct acpi_device *device, int state) { int result = 0; diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 89125808fbd5..673a3f4d1f07 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -327,7 +327,6 @@ void acpi_bus_data_handler(acpi_handle handle, void *context); acpi_status acpi_bus_get_status_handle(acpi_handle handle, unsigned long long *sta); int acpi_bus_get_status(struct acpi_device *device); -int acpi_bus_get_power(acpi_handle handle, int *state); int acpi_bus_set_power(acpi_handle handle, int state); int acpi_bus_update_power(acpi_handle handle, int *state_p); bool acpi_bus_power_manageable(acpi_handle handle); |