diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2010-12-11 17:44:39 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2011-01-12 04:48:45 -0500 |
commit | f6767dcf2a4f6e62960912d0affec1e15a246191 (patch) | |
tree | 266b6321c882867f5bb183fb6f29d0f1ee064798 | |
parent | 40b7397579e006c0f9cf4de58e9ccc350e06308f (diff) |
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) | |||
236 | } | 236 | } |
237 | 237 | ||
238 | 238 | ||
239 | int acpi_bus_get_power(acpi_handle handle, int *state) | ||
240 | { | ||
241 | struct acpi_device *device; | ||
242 | int result; | ||
243 | |||
244 | result = acpi_bus_get_device(handle, &device); | ||
245 | if (result) | ||
246 | return result; | ||
247 | |||
248 | result = __acpi_bus_get_power(device, state); | ||
249 | if (result) | ||
250 | return result; | ||
251 | |||
252 | device->power.state = *state; | ||
253 | return 0; | ||
254 | } | ||
255 | EXPORT_SYMBOL(acpi_bus_get_power); | ||
256 | |||
257 | |||
258 | static int __acpi_bus_set_power(struct acpi_device *device, int state) | 239 | static int __acpi_bus_set_power(struct acpi_device *device, int state) |
259 | { | 240 | { |
260 | int result = 0; | 241 | 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); | |||
327 | acpi_status acpi_bus_get_status_handle(acpi_handle handle, | 327 | acpi_status acpi_bus_get_status_handle(acpi_handle handle, |
328 | unsigned long long *sta); | 328 | unsigned long long *sta); |
329 | int acpi_bus_get_status(struct acpi_device *device); | 329 | int acpi_bus_get_status(struct acpi_device *device); |
330 | int acpi_bus_get_power(acpi_handle handle, int *state); | ||
331 | int acpi_bus_set_power(acpi_handle handle, int state); | 330 | int acpi_bus_set_power(acpi_handle handle, int state); |
332 | int acpi_bus_update_power(acpi_handle handle, int *state_p); | 331 | int acpi_bus_update_power(acpi_handle handle, int *state_p); |
333 | bool acpi_bus_power_manageable(acpi_handle handle); | 332 | bool acpi_bus_power_manageable(acpi_handle handle); |