Skip to content

Commit

Permalink
ACPI: scan: Reorganize acpi_device_add()
Browse files Browse the repository at this point in the history
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@intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
  • Loading branch information
Rafael J. Wysocki committed Jun 17, 2021
1 parent dc61248 commit c6a493a
Showing 1 changed file with 20 additions and 11 deletions.
31 changes: 20 additions & 11 deletions drivers/acpi/scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -633,23 +633,32 @@ static int acpi_device_set_name(struct acpi_device *device,
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
Expand Down

0 comments on commit c6a493a

Please sign in to comment.