ACPI: scan: Relocate acpi_bus_trim_one()

Relocate acpi_bus_trim_one() (without modifications) so as to avoid the
need to add a forward declaration of it in a subsequent patch.

No functional changes.

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

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index dd817e9ed2e56b001eda3420dd514fcac3b90fe1..e641a7c873589ec00f0be9321bf8e7c832d111a8 100644 (file)
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -244,6 +244,32 @@ static int acpi_scan_try_to_offline(struct acpi_device *device)
        return 0;
 }
 
+static int acpi_bus_trim_one(struct acpi_device *adev, void *not_used)
+{
+       struct acpi_scan_handler *handler = adev->handler;
+
+       acpi_dev_for_each_child_reverse(adev, acpi_bus_trim_one, NULL);
+
+       adev->flags.match_driver = false;
+       if (handler) {
+               if (handler->detach)
+                       handler->detach(adev);
+
+               adev->handler = NULL;
+       } else {
+               device_release_driver(&adev->dev);
+       }
+       /*
+        * Most likely, the device is going away, so put it into D3cold before
+        * that.
+        */
+       acpi_device_set_power(adev, ACPI_STATE_D3_COLD);
+       adev->flags.initialized = false;
+       acpi_device_clear_enumerated(adev);
+
+       return 0;
+}
+
 static int acpi_scan_hot_remove(struct acpi_device *device)
 {
        acpi_handle handle = device->handle;
@@ -2547,32 +2573,6 @@ int acpi_bus_scan(acpi_handle handle)
 }
 EXPORT_SYMBOL(acpi_bus_scan);
 
-static int acpi_bus_trim_one(struct acpi_device *adev, void *not_used)
-{
-       struct acpi_scan_handler *handler = adev->handler;
-
-       acpi_dev_for_each_child_reverse(adev, acpi_bus_trim_one, NULL);
-
-       adev->flags.match_driver = false;
-       if (handler) {
-               if (handler->detach)
-                       handler->detach(adev);
-
-               adev->handler = NULL;
-       } else {
-               device_release_driver(&adev->dev);
-       }
-       /*
-        * Most likely, the device is going away, so put it into D3cold before
-        * that.
-        */
-       acpi_device_set_power(adev, ACPI_STATE_D3_COLD);
-       adev->flags.initialized = false;
-       acpi_device_clear_enumerated(adev);
-
-       return 0;
-}
-
 /**
  * acpi_bus_trim - Detach scan handlers and drivers from ACPI device objects.
  * @adev: Root of the ACPI namespace scope to walk.