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

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

ACPI / hotplug / PCI: Rework acpiphp_handle_to_bridge() 



Using the hotplug context objects introduced previously rework the
ACPI-based PCI hotplug (ACPIPHP) core code to get to acpiphp_bridge
objects associated with hotplug bridges from those context objects
rather than from the global list of hotplug bridges.

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

drivers/pci/hotplug/acpiphp_glue.c

+11 −9
Original line number Diff line number Diff line
@@ -454,18 +454,20 @@ static int detect_ejectable_slots(acpi_handle handle) 


static struct acpiphp_bridge *acpiphp_handle_to_bridge(acpi_handle handle)

{

	struct acpiphp_bridge *bridge;

	struct acpiphp_context *context;

	struct acpiphp_bridge *bridge = NULL;



	mutex_lock(&bridge_mutex);

	list_for_each_entry(bridge, &bridge_list, list)

		if (bridge->handle == handle) {

	mutex_lock(&acpiphp_context_lock);

	context = acpiphp_get_context(handle);

	if (context) {

		bridge = context->bridge;

		if (bridge)

			get_bridge(bridge);

			mutex_unlock(&bridge_mutex);

			return bridge;

		}

	mutex_unlock(&bridge_mutex);



	return NULL;

		acpiphp_put_context(context);

	}

	mutex_unlock(&acpiphp_context_lock);

	return bridge;

}



static void cleanup_bridge(struct acpiphp_bridge *bridge)