diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-13 23:27:24 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-23 04:00:21 +0200 |
| commit | f28181109e85b49b5b4b1c381d889b4ea7315988 (patch) | |
| tree | 4f6b7f75723ec666ebc97ad352486f60011aea59 /drivers/pci/hotplug | |
| parent | ACPI / hotplug / PCI: Merge hotplug event handling functions (diff) | |
| download | linux-dev-f28181109e85b49b5b4b1c381d889b4ea7315988.tar.xz linux-dev-f28181109e85b49b5b4b1c381d889b4ea7315988.zip | |
ACPI / hotplug / PCI: Drop func field from struct acpiphp_bridge
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>
Diffstat (limited to 'drivers/pci/hotplug')
| -rw-r--r-- | drivers/pci/hotplug/acpiphp.h | 2 | ||||
| -rw-r--r-- | drivers/pci/hotplug/acpiphp_glue.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h index b96a8a9c39c7..4980ff4919a6 100644 --- a/drivers/pci/hotplug/acpiphp.h +++ b/drivers/pci/hotplug/acpiphp.h @@ -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; diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index e2f9ea03aece..a83ce9db16bb 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c @@ -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; } |