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>

1 files changed, 1 insertions, 2 deletions

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;
         }