ACPI: Move acpi_bus_get_device() from bus.c to scan.c

Move acpi_bus_get_device() from bus.c to scan.c which allows
acpi_bus_data_handler() to become static and clean up the latter.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

3 files changed, 22 insertions, 30 deletions

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 25b289ff4290..7df97d277545 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -89,27 +89,6 @@ static struct dmi_system_id dsdt_dmi_table[] __initdata = {
                                 Device Management
    -------------------------------------------------------------------------- */
 
-int acpi_bus_get_device(acpi_handle handle, struct acpi_device **device)
-{
-        acpi_status status;
-
-        if (!device)
-                return -EINVAL;
-
-        /* TBD: Support fixed-feature devices */
-
-        status = acpi_get_data(handle, acpi_bus_data_handler, (void **)device);
-        if (ACPI_FAILURE(status) || !*device) {
-                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No context for object [%p]\n",
-                                  handle));
-                return -ENODEV;
-        }
-
-        return 0;
-}
-
-EXPORT_SYMBOL(acpi_bus_get_device);
-
 acpi_status acpi_bus_get_status_handle(acpi_handle handle,
                                        unsigned long long *sta)
 {
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 10985573aaa7..4b2679342e82 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -997,6 +997,28 @@ struct bus_type acpi_bus_type = {
         .uevent         = acpi_device_uevent,
 };
 
+static void acpi_bus_data_handler(acpi_handle handle, void *context)
+{
+        /* Intentionally empty. */
+}
+
+int acpi_bus_get_device(acpi_handle handle, struct acpi_device **device)
+{
+        acpi_status status;
+
+        if (!device)
+                return -EINVAL;
+
+        status = acpi_get_data(handle, acpi_bus_data_handler, (void **)device);
+        if (ACPI_FAILURE(status) || !*device) {
+                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No context for object [%p]\n",
+                                  handle));
+                return -ENODEV;
+        }
+        return 0;
+}
+EXPORT_SYMBOL_GPL(acpi_bus_get_device);
+
 int acpi_device_add(struct acpi_device *device,
                     void (*release)(struct device *))
 {
@@ -1208,14 +1230,6 @@ acpi_bus_get_ejd(acpi_handle handle, acpi_handle *ejd)
 }
 EXPORT_SYMBOL_GPL(acpi_bus_get_ejd);
 
-void acpi_bus_data_handler(acpi_handle handle, void *context)
-{
-
-        /* TBD */
-
-        return;
-}
-
 static int acpi_bus_extract_wakeup_device_power_package(acpi_handle handle,
                                         struct acpi_device_wakeup *wakeup)
 {
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 2650d1f19e43..2a42cb36d238 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -363,7 +363,6 @@ extern void unregister_acpi_bus_notifier(struct notifier_block *nb);
  */
 
 int acpi_bus_get_device(acpi_handle handle, struct acpi_device **device);
-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);