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

ACPI / hotplug / PCI: Drop acpiphp_bus_add() 



acpiphp_bus_add() is only called from one place, so move the code out
of it into that place and drop it.  Also make that code use
func_to_acpi_device() to get the struct acpi_device pointer it needs
instead of calling acpi_bus_get_device() which may be costly.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent bbcbfc0e

drivers/pci/hotplug/acpiphp_glue.c

+6 −16
Original line number Diff line number Diff line
@@ -491,20 +491,6 @@ static unsigned char acpiphp_max_busnr(struct pci_bus *bus) 
	return max;

}



/**

 * acpiphp_bus_add - Scan ACPI namespace subtree.

 * @handle: ACPI object handle to start the scan from.

 */

static void acpiphp_bus_add(acpi_handle handle)

{

	struct acpi_device *adev = NULL;



	acpi_bus_scan(handle);

	acpi_bus_get_device(handle, &adev);

	if (acpi_device_enumerated(adev))

		acpi_device_set_power(adev, ACPI_STATE_D0);

}



static void acpiphp_set_acpi_region(struct acpiphp_slot *slot)

{

	struct acpiphp_func *func;
@@ -544,9 +530,13 @@ static int acpiphp_rescan_slot(struct acpiphp_slot *slot) 
{

	struct acpiphp_func *func;



	list_for_each_entry(func, &slot->funcs, sibling)

		acpiphp_bus_add(func_to_handle(func));

	list_for_each_entry(func, &slot->funcs, sibling) {

		struct acpi_device *adev = func_to_acpi_device(func);



		acpi_bus_scan(adev->handle);

		if (acpi_device_enumerated(adev))

			acpi_device_set_power(adev, ACPI_STATE_D0);

	}

	return pci_scan_slot(slot->bus, PCI_DEVFN(slot->device, 0));

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE