Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

ACPI / hotplug / PCI: Rework acpiphp_check_host_bridge() 



Since the only existing caller of acpiphp_check_host_bridge(),
which is acpi_pci_root_scan_dependent(), already has a struct
acpi_device pointer needed to obtain the ACPIPHP context, it
doesn't make sense to execute acpi_bus_get_device() on its
handle in acpiphp_handle_to_bridge() just in order to get that
pointer back.

For this reason, modify acpiphp_check_host_bridge() to take
a struct acpi_device pointer as its argument and rearrange the
code accordingly.

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

drivers/acpi/pci_root.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ static void acpi_pci_root_remove(struct acpi_device *device); 




static int acpi_pci_root_scan_dependent(struct acpi_device *adev)

static int acpi_pci_root_scan_dependent(struct acpi_device *adev)

{

{

	acpiphp_check_host_bridge(adev->handle);

	acpiphp_check_host_bridge(adev);

	return 0;

	return 0;

}

}

drivers/pci/hotplug/acpiphp_glue.c

+3 −8
Original line number Original line Diff line number Diff line
@@ -382,15 +382,11 @@ static acpi_status register_slot(acpi_handle handle, u32 lvl, void *data, 
	return AE_OK;

	return AE_OK;

}

}





static struct acpiphp_bridge *acpiphp_handle_to_bridge(acpi_handle handle)

static struct acpiphp_bridge *acpiphp_dev_to_bridge(struct acpi_device *adev)

{

{

	struct acpi_device *adev = acpi_bus_get_acpi_device(handle);

	struct acpiphp_context *context;

	struct acpiphp_context *context;

	struct acpiphp_bridge *bridge = NULL;

	struct acpiphp_bridge *bridge = NULL;





	if (!adev)

		return NULL;



	acpi_lock_hp_context();

	acpi_lock_hp_context();

	context = acpiphp_get_context(adev);

	context = acpiphp_get_context(adev);

	if (context) {

	if (context) {
@@ -401,7 +397,6 @@ static struct acpiphp_bridge *acpiphp_handle_to_bridge(acpi_handle handle) 
		acpiphp_put_context(context);

		acpiphp_put_context(context);

	}

	}

	acpi_unlock_hp_context();

	acpi_unlock_hp_context();

	acpi_bus_put_acpi_device(adev);

	return bridge;

	return bridge;

}

}
@@ -768,11 +763,11 @@ static void acpiphp_sanitize_bus(struct pci_bus *bus) 
 * ACPI event handlers

 * ACPI event handlers

 */

 */





void acpiphp_check_host_bridge(acpi_handle handle)

void acpiphp_check_host_bridge(struct acpi_device *adev)

{

{

	struct acpiphp_bridge *bridge;

	struct acpiphp_bridge *bridge;





	bridge = acpiphp_handle_to_bridge(handle);

	bridge = acpiphp_dev_to_bridge(adev);

	if (bridge) {

	if (bridge) {

		pci_lock_rescan_remove();

		pci_lock_rescan_remove();

include/linux/pci-acpi.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -59,12 +59,12 @@ static inline void acpi_pci_slot_remove(struct pci_bus *bus) { } 
void acpiphp_init(void);

void acpiphp_init(void);

void acpiphp_enumerate_slots(struct pci_bus *bus);

void acpiphp_enumerate_slots(struct pci_bus *bus);

void acpiphp_remove_slots(struct pci_bus *bus);

void acpiphp_remove_slots(struct pci_bus *bus);

void acpiphp_check_host_bridge(acpi_handle handle);

void acpiphp_check_host_bridge(struct acpi_device *adev);

#else

#else

static inline void acpiphp_init(void) { }

static inline void acpiphp_init(void) { }

static inline void acpiphp_enumerate_slots(struct pci_bus *bus) { }

static inline void acpiphp_enumerate_slots(struct pci_bus *bus) { }

static inline void acpiphp_remove_slots(struct pci_bus *bus) { }

static inline void acpiphp_remove_slots(struct pci_bus *bus) { }

static inline void acpiphp_check_host_bridge(acpi_handle handle) { }

static inline void acpiphp_check_host_bridge(struct acpi_device *adev) { }

#endif

#endif





#else	/* CONFIG_ACPI */

#else	/* CONFIG_ACPI */