Skip to content

Commit

Permalink
ACPI / hotplug / PCI: Rework acpiphp_handle_to_bridge()
Browse files Browse the repository at this point in the history
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: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com>
  • Loading branch information
Rafael J. Wysocki committed Jul 23, 2013
1 parent 8783127 commit ed13feb
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions drivers/pci/hotplug/acpiphp_glue.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit ed13feb

Please sign in to comment.