Received-SPF: pass (google.com: domain of linux-kernel+bounces-81938-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Precedence: bulk
MIME-Version: 1.0
References: <6021126.lOV4Wx5bFT@kreacher> <2175138.irdbgypaU6@kreacher>
In-Reply-To: <2175138.irdbgypaU6@kreacher>
From: "Rafael J. Wysocki" <rafael@kernel.org>
Date: Mon, 26 Feb 2024 17:49:29 +0100
Message-ID: <CAJZ5v0hbSMQVaBry_hye9wrEOjMq2_anhbV0B48eTF8FWYpFXw@mail.gmail.com>
Subject: Re: [PATCH v2 2/5] ACPI: scan: Relocate acpi_bus_trim_one()
To: Jonathan Cameron <jonathan.cameron@huawei.com>
Cc: Linux ACPI <linux-acpi@vger.kernel.org>, LKML <linux-kernel@vger.kernel.org>, 
	Mika Westerberg <mika.westerberg@linux.intel.com>, "Rafael J. Wysocki" <rafael@kernel.org>, 
	"Russell King (Oracle)" <linux@armlinux.org.uk>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Mon, Feb 26, 2024 at 5:47=E2=80=AFPM Rafael J. Wysocki <rjw@rjwysocki.ne=
t> 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
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- 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 =3D adev->handler;
> +
> +       acpi_dev_for_each_child_reverse(adev, acpi_bus_trim_one, NULL);
> +
> +       adev->flags.match_driver =3D false;
> +       if (handler) {
> +               if (handler->detach)
> +                       handler->detach(adev);
> +
> +               adev->handler =3D NULL;
> +       } else {
> +               device_release_driver(&adev->dev);
> +       }
> +       /*
> +        * Most likely, the device is going away, so put it into D3cold b=
efore
> +        * that.
> +        */
> +       acpi_device_set_power(adev, ACPI_STATE_D3_COLD);
> +       adev->flags.initialized =3D false;
> +       acpi_device_clear_enumerated(adev);
> +
> +       return 0;
> +}
> +
>  static int acpi_scan_hot_remove(struct acpi_device *device)
>  {
>         acpi_handle handle =3D 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 =3D adev->handler;
> -
> -       acpi_dev_for_each_child_reverse(adev, acpi_bus_trim_one, NULL);
> -
> -       adev->flags.match_driver =3D false;
> -       if (handler) {
> -               if (handler->detach)
> -                       handler->detach(adev);
> -
> -               adev->handler =3D NULL;
> -       } else {
> -               device_release_driver(&adev->dev);
> -       }
> -       /*
> -        * Most likely, the device is going away, so put it into D3cold b=
efore
> -        * that.
> -        */
> -       acpi_device_set_power(adev, ACPI_STATE_D3_COLD);
> -       adev->flags.initialized =3D false;
> -       acpi_device_clear_enumerated(adev);
> -
> -       return 0;
> -}
> -
>  /**
>   * acpi_bus_trim - Detach scan handlers and drivers from ACPI device obj=
ects.
>   * @adev: Root of the ACPI namespace scope to walk.
>
>
>