ACPI / hotplug / PCI: Eliminate acpiphp_dev_to_bridge()

Since acpiphp_dev_to_bridge() is only called by
acpiphp_check_host_bridge(), move the code from it to that function
directly which reduces the call chain depth and makes the code
slightly easier to follow.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 602d153c7055b0227416c2d960a1efe4688aa847..08043f9c1dd5c3d83d2f0af55f33c136461c2b9e 100644 (file)
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -369,20 +369,6 @@ static acpi_status acpiphp_add_context(acpi_handle handle, u32 lvl, void *data,
        return AE_OK;
 }
 
-static struct acpiphp_bridge *acpiphp_dev_to_bridge(struct acpi_device *adev)
-{
-       struct acpiphp_bridge *bridge = NULL;
-
-       acpi_lock_hp_context();
-       if (adev->hp) {
-               bridge = to_acpiphp_root_context(adev->hp)->root_bridge;
-               if (bridge)
-                       get_bridge(bridge);
-       }
-       acpi_unlock_hp_context();
-       return bridge;
-}
-
 static void cleanup_bridge(struct acpiphp_bridge *bridge)
 {
        struct acpiphp_slot *slot;
@@ -753,9 +739,15 @@ static void acpiphp_sanitize_bus(struct pci_bus *bus)
 
 void acpiphp_check_host_bridge(struct acpi_device *adev)
 {
-       struct acpiphp_bridge *bridge;
+       struct acpiphp_bridge *bridge = NULL;
 
-       bridge = acpiphp_dev_to_bridge(adev);
+       acpi_lock_hp_context();
+       if (adev->hp) {
+               bridge = to_acpiphp_root_context(adev->hp)->root_bridge;
+               if (bridge)
+                       get_bridge(bridge);
+       }
+       acpi_unlock_hp_context();
        if (bridge) {
                pci_lock_rescan_remove();