diff mbox series

[v2,2/5] ACPI: scan: Relocate acpi_bus_trim_one()

Message ID 2175138.irdbgypaU6@kreacher
State New
Headers
Series ACPI: scan: Check enabled _STA bit on Bus/Device Checks |

Commit Message

Rafael J. Wysocki Feb. 26, 2024, 4:36 p.m. UTC 
  From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

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>
---

v1 -> v2: Add R-by from Jonathan.

---
 drivers/acpi/scan.c |   52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

Comments

Rafael J. Wysocki Feb. 26, 2024, 4:49 p.m. UTC | #1 
On Mon, Feb 26, 2024 at 5:47 PM Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
>
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> 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>
> ---
>
> v1 -> v2: Add R-by from Jonathan.

I actually forgot to add the R-bys, but let's assume they are here (no
need to look at the first two patches again).

> ---
>  drivers/acpi/scan.c |   52 ++++++++++++++++++++++++++--------------------------
>  1 file changed, 26 insertions(+), 26 deletions(-)
>
> Index: linux-pm/drivers/acpi/scan.c
> ===================================================================
> --- linux-pm.orig/drivers/acpi/scan.c
> +++ linux-pm/drivers/acpi/scan.c
> @@ -244,6 +244,32 @@ static int acpi_scan_try_to_offline(stru
>         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.
>
>
>
diff mbox series

Patch

Index: linux-pm/drivers/acpi/scan.c
===================================================================
--- linux-pm.orig/drivers/acpi/scan.c
+++ linux-pm/drivers/acpi/scan.c
@@ -244,6 +244,32 @@  static int acpi_scan_try_to_offline(stru
 	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.