Hi,
On 6/16/21 4:24 PM, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
>
> Move the invocation of acpi_attach_data() in acpi_device_add()
> into a separate function.
>
> No intentional functional impact.
>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
Thanks, patch looks good to me:
Reviewed-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Regards,
Hans
> ---
> drivers/acpi/scan.c | 31 ++++++++++++++++++++-----------
> 1 file changed, 20 insertions(+), 11 deletions(-)
>
> Index: linux-pm/drivers/acpi/scan.c
> ===================================================================
> --- linux-pm.orig/drivers/acpi/scan.c
> +++ linux-pm/drivers/acpi/scan.c
> @@ -640,23 +640,32 @@ static int acpi_device_set_name(struct a
> return 0;
> }
>
> +static int acpi_tie_acpi_dev(struct acpi_device *adev)
> +{
> + acpi_handle handle = adev->handle;
> + acpi_status status;
> +
> + if (!handle)
> + return 0;
> +
> + status = acpi_attach_data(handle, acpi_scan_drop_device, adev);
> + if (ACPI_FAILURE(status)) {
> + acpi_handle_err(handle, "Unable to attach device data\n");
> + return -ENODEV;
> + }
> +
> + return 0;
> +}
> +
> int acpi_device_add(struct acpi_device *device,
> void (*release)(struct device *))
> {
> struct acpi_device_bus_id *acpi_device_bus_id;
> int result;
>
> - if (device->handle) {
> - acpi_status status;
> -
> - status = acpi_attach_data(device->handle, acpi_scan_drop_device,
> - device);
> - if (ACPI_FAILURE(status)) {
> - acpi_handle_err(device->handle,
> - "Unable to attach device data\n");
> - return -ENODEV;
> - }
> - }
> + result = acpi_tie_acpi_dev(device);
> + if (result)
> + return result;
>
> /*
> * Linkage
>
>
>
