[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <add60819-1d36-9b96-7bfa-148907dc44ce@redhat.com>
Date: Mon, 18 Sep 2023 15:36:58 +1000
From: Gavin Shan <gshan@...hat.com>
To: James Morse <james.morse@....com>, linux-pm@...r.kernel.org,
loongarch@...ts.linux.dev, linux-acpi@...r.kernel.org,
linux-arch@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org,
linux-riscv@...ts.infradead.org, kvmarm@...ts.linux.dev
Cc: x86@...nel.org, Salil Mehta <salil.mehta@...wei.com>,
Russell King <linux@...linux.org.uk>,
Jean-Philippe Brucker <jean-philippe@...aro.org>,
jianyong.wu@....com, justin.he@....com
Subject: Re: [RFC PATCH v2 19/35] ACPI: Move acpi_bus_trim_one() before
acpi_scan_hot_remove()
On 9/14/23 02:38, James Morse wrote:
> A subsequent patch will change acpi_scan_hot_remove() to call
> acpi_bus_trim_one() instead of acpi_bus_trim(), meaning it can no longer
> rely on the prototype in the header file.
>
> Move these functions further up the file.
> No change in behaviour.
>
> Signed-off-by: James Morse <james.morse@....com>
> ---
> drivers/acpi/scan.c | 76 ++++++++++++++++++++++-----------------------
> 1 file changed, 38 insertions(+), 38 deletions(-)
>
Reviewed-by: Gavin Shan <gshan@...hat.com>
> diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
> index f898591ce05f..a675333618ae 100644
> --- a/drivers/acpi/scan.c
> +++ b/drivers/acpi/scan.c
> @@ -244,6 +244,44 @@ 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;
> +}
> +
> +/**
> + * acpi_bus_trim - Detach scan handlers and drivers from ACPI device objects.
> + * @adev: Root of the ACPI namespace scope to walk.
> + *
> + * Must be called under acpi_scan_lock.
> + */
> +void acpi_bus_trim(struct acpi_device *adev)
> +{
> + acpi_bus_trim_one(adev, NULL);
> +}
> +EXPORT_SYMBOL_GPL(acpi_bus_trim);
> +
> static int acpi_scan_hot_remove(struct acpi_device *device)
> {
> acpi_handle handle = device->handle;
> @@ -2506,44 +2544,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.
> - *
> - * Must be called under acpi_scan_lock.
> - */
> -void acpi_bus_trim(struct acpi_device *adev)
> -{
> - acpi_bus_trim_one(adev, NULL);
> -}
> -EXPORT_SYMBOL_GPL(acpi_bus_trim);
> -
> int acpi_bus_register_early_device(int type)
> {
> struct acpi_device *device = NULL;
Thanks,
Gavin
Powered by blists - more mailing lists