[PATCH 12/13] ACPI / PM: Drop acpi_bus_get_power()

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Rafael J. Wysocki
Date: Wednesday, November 24, 2010 - 4:12 pm

From: Rafael J. Wysocki <rjw@sisk.pl>

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>
---
 drivers/acpi/bus.c      |   19 -------------------
 include/acpi/acpi_bus.h |    1 -
 2 files changed, 20 deletions(-)

Index: linux-2.6/drivers/acpi/bus.c
===================================================================
--- linux-2.6.orig/drivers/acpi/bus.c
+++ linux-2.6/drivers/acpi/bus.c
@@ -236,25 +236,6 @@ static int __acpi_bus_get_power(struct a
 }
 
 
-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;
Index: linux-2.6/include/acpi/acpi_bus.h
===================================================================
--- linux-2.6.orig/include/acpi/acpi_bus.h
+++ linux-2.6/include/acpi/acpi_bus.h
@@ -327,7 +327,6 @@ void acpi_bus_data_handler(acpi_handle h
 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);

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 0/13] ACPI / PM: Rework power resources management, Rafael J. Wysocki, (Wed Nov 24, 4:01 pm)
[PATCH 1/13] ACPI / PM: Check device state before refcount ..., Rafael J. Wysocki, (Wed Nov 24, 4:02 pm)
[PATCH 2/13] ACPI / PM: Do not refcount power resources th ..., Rafael J. Wysocki, (Wed Nov 24, 4:03 pm)
[PATCH 3/13] ACPI / PM: Prevent acpi_power_get_inferred_st ..., Rafael J. Wysocki, (Wed Nov 24, 4:05 pm)
[PATCH 4/13] ACPI / PM: Add functions for manipulating lis ..., Rafael J. Wysocki, (Wed Nov 24, 4:06 pm)
[PATCH 5/13] ACPI / PM: Introduce function for refcounting ..., Rafael J. Wysocki, (Wed Nov 24, 4:06 pm)
[PATCH 6/13] ACPI / PM: Introduce __acpi_bus_get_power(), Rafael J. Wysocki, (Wed Nov 24, 4:07 pm)
[PATCH 7/13] ACPI / PM: Add function for device power stat ..., Rafael J. Wysocki, (Wed Nov 24, 4:08 pm)
[PATCH 8/13] ACPI / PM: Add function for updating device p ..., Rafael J. Wysocki, (Wed Nov 24, 4:09 pm)
[PATCH 9/13] ACPI / PM: Register acpi_power_driver early, Rafael J. Wysocki, (Wed Nov 24, 4:10 pm)
[PATCH 10/13] ACPI / PM: Register power resource devices a ..., Rafael J. Wysocki, (Wed Nov 24, 4:10 pm)
[PATCH 11/13] ACPI / Fan: Rework the handling of power res ..., Rafael J. Wysocki, (Wed Nov 24, 4:11 pm)
[PATCH 12/13] ACPI / PM: Drop acpi_bus_get_power(), Rafael J. Wysocki, (Wed Nov 24, 4:12 pm)
[PATCH 13/13] ACPI / PM: Drop acpi_power_nocheck, Rafael J. Wysocki, (Wed Nov 24, 4:12 pm)
[PATCH] Platform / x86: Make fujitsu_laptop use acpi_bus_u ..., Rafael J. Wysocki, (Fri Nov 26, 2:55 pm)
Re: [PATCH 12/13] ACPI / PM: Drop acpi_bus_get_power(), Rafael J. Wysocki, (Wed Dec 1, 3:07 pm)