ACPI / hotplug / PCI: Store parent in functions and bus in slots

To avoid chasing more pointers than necessary in some situations,
move the bridge pointer from struct acpiphp_slot to struct
acpiphp_func (and call it 'parent') and add a bus pointer to
struct acpiphp_slot.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/pci/hotplug/acpiphp_core.c b/drivers/pci/hotplug/acpiphp_core.c
index 1798740f7e18..8f20e6021611 100644
--- a/drivers/pci/hotplug/acpiphp_core.c
+++ b/drivers/pci/hotplug/acpiphp_core.c
@@ -321,10 +321,8 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot,
         slot->sun = sun;
         snprintf(name, SLOT_NAME_SIZE, "%u", sun);
 
-        retval = pci_hp_register(slot->hotplug_slot,
-                                        acpiphp_slot->bridge->pci_bus,
-                                        acpiphp_slot->device,
-                                        name);
+        retval = pci_hp_register(slot->hotplug_slot, acpiphp_slot->bus,
+                                 acpiphp_slot->device, name);
         if (retval == -EBUSY)
                 goto error_hpslot;
         if (retval) {