From 393382345e411ada576cef3b48f6a053b39d5b1b Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Sat, 11 Dec 2010 23:44:39 +0100
Subject: [PATCH] --- yaml --- r: 230901 b: refs/heads/master c:
 f6767dcf2a4f6e62960912d0affec1e15a246191 h: refs/heads/master i:   230899:
 2bb0a8f376325ab0f9daea559d48d8d246ad40e9 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/acpi/bus.c      | 19 -------------------
 trunk/include/acpi/acpi_bus.h |  1 -
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index ba4dc5b62b6f..6d67a96a2a38 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40b7397579e006c0f9cf4de58e9ccc350e06308f
+refs/heads/master: f6767dcf2a4f6e62960912d0affec1e15a246191
diff --git a/trunk/drivers/acpi/bus.c b/trunk/drivers/acpi/bus.c
index 2ee83b5fff97..0baa5f97734a 100644
--- a/trunk/drivers/acpi/bus.c
+++ b/trunk/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/trunk/include/acpi/acpi_bus.h b/trunk/include/acpi/acpi_bus.h
index 89125808fbd5..673a3f4d1f07 100644
--- a/trunk/include/acpi/acpi_bus.h
+++ b/trunk/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);