Commit f6f1e12f authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI: scan: Rename acpi_bus_get_parent() and rearrange it 



The acpi_bus_get_parent() name doesn't really reflect the
purpose of the function so change it to a more accurate
acpi_find_parent_acpi_dev().

While at it, rearrange the code inside that function to make it
easier to read.

No intentional functional impact.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarPunit Agrawal <punit.agrawal@bytedance.com>
parent 45e9aa1f

drivers/acpi/scan.c

+13 −9
Original line number Diff line number Diff line
@@ -816,10 +816,9 @@ static const char * const acpi_honor_dep_ids[] = { 
	NULL

};



static struct acpi_device *acpi_bus_get_parent(acpi_handle handle)

static struct acpi_device *acpi_find_parent_acpi_dev(acpi_handle handle)

{

	struct acpi_device *device;

	acpi_status status;

	struct acpi_device *adev;



	/*

	 * Fixed hardware devices do not appear in the namespace and do not
@@ -830,13 +829,18 @@ static struct acpi_device *acpi_bus_get_parent(acpi_handle handle) 
		return acpi_root;



	do {

		acpi_status status;



		status = acpi_get_parent(handle, &handle);

		if (ACPI_FAILURE(status))

			return status == AE_NULL_ENTRY ? NULL : acpi_root;

		if (ACPI_FAILURE(status)) {

			if (status != AE_NULL_ENTRY)

				return acpi_root;



		device = acpi_fetch_acpi_dev(handle);

	} while (!device);

	return device;

			return NULL;

		}

		adev = acpi_fetch_acpi_dev(handle);

	} while (!adev);

	return adev;

}



acpi_status
@@ -1778,7 +1782,7 @@ void acpi_init_device_object(struct acpi_device *device, acpi_handle handle, 
	INIT_LIST_HEAD(&device->pnp.ids);

	device->device_type = type;

	device->handle = handle;

	device->parent = acpi_bus_get_parent(handle);

	device->parent = acpi_find_parent_acpi_dev(handle);

	fwnode_init(&device->fwnode, &acpi_device_fwnode_ops);

	acpi_set_device_status(device, ACPI_STA_DEFAULT);

	acpi_device_get_busid(device);