leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACPI / hotplug / PCI: Drop func field from struct acpiphp_bridge

Browse Source 
Since the func pointer in struct acpiphp_context can always be used
instead of the func pointer in struct acpiphp_bridge, drop the
latter.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com>
This commit is contained in:
Rafael J. Wysocki 2013-07-13 23:27:24 +02:00
parent 43e5c091c7
commit f28181109e
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pci/hotplug/acpiphp.h
View File

@ -79,8 +79,6 @@ struct acpiphp_bridge {
acpi_handle handle;
struct acpiphp_context *context;
/* Ejectable PCI-to-PCI bridge (PCI bridge and PCI function) */
struct acpiphp_func *func;
int nr_slots;

3
drivers/pci/hotplug/acpiphp_glue.c
View File

@ -181,7 +181,7 @@ static void free_bridge(struct kref *kref)
context = bridge->context;
/* Release the reference acquired by acpiphp_enumerate_slots(). */
if (context->handler_for_func)
put_bridge(bridge->func->slot->bridge);
put_bridge(context->func->slot->bridge);
put_device(&bridge->pci_bus->dev);
pci_dev_put(bridge->pci_dev);
@ -1212,7 +1212,6 @@ void acpiphp_enumerate_slots(struct pci_bus *bus)
}
if (context->handler_for_func) {
/* Notify handler already installed. */
bridge->func = context->func;
get_bridge(context->func->slot->bridge);
return;
}