Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...

[firefly-linux-kernel-4.4.55.git] / include / linux / pci-acpi.h

diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h
index 092e82e0048c969e7b54b17dbd6dcd548969bb6c..93a7c08f869d4fcc7017862505156fdd21e24433 100644 (file)
--- a/include/linux/pci-acpi.h
+++ b/include/linux/pci-acpi.h
@@ -15,7 +15,7 @@ static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
 {
        struct pci_bus *pbus = pdev->bus;
        /* Find a PCI root bus */
-       while (pbus->parent)
+       while (!pci_is_root_bus(pbus))
                pbus = pbus->parent;
        return acpi_get_pci_rootbridge_handle(pci_domain_nr(pbus),
                                              pbus->number);
@@ -23,7 +23,7 @@ static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
 
 static inline acpi_handle acpi_pci_get_bridge_handle(struct pci_bus *pbus)
 {
-       if (pbus->parent)
+       if (!pci_is_root_bus(pbus))
                return DEVICE_ACPI_HANDLE(&(pbus->self->dev));
        return acpi_get_pci_rootbridge_handle(pci_domain_nr(pbus),
                                              pbus->number);