PCI: Rename pci_is_bridge() to pci_has_subordinate()

Previously, pci_is_bridge() returned true only when a subordinate bus
existed.  Rename pci_is_bridge() to pci_has_subordinate() to better
indicate what we're checking.

No functional change.

[bhelgaas: changelog]
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index d911e0c1f359..b7850cb4b907 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -580,14 +580,14 @@ static void pci_pm_default_resume(struct pci_dev *pci_dev)
 {
         pci_fixup_device(pci_fixup_resume, pci_dev);
 
-        if (!pci_is_bridge(pci_dev))
+        if (!pci_has_subordinate(pci_dev))
                 pci_enable_wake(pci_dev, PCI_D0, false);
 }
 
 static void pci_pm_default_suspend(struct pci_dev *pci_dev)
 {
         /* Disable non-bridge devices without PM support */
-        if (!pci_is_bridge(pci_dev))
+        if (!pci_has_subordinate(pci_dev))
                 pci_disable_enabled_device(pci_dev);
 }
 
@@ -717,7 +717,7 @@ static int pci_pm_suspend_noirq(struct device *dev)
 
         if (!pci_dev->state_saved) {
                 pci_save_state(pci_dev);
-                if (!pci_is_bridge(pci_dev))
+                if (!pci_has_subordinate(pci_dev))
                         pci_prepare_to_sleep(pci_dev);
         }
 
@@ -971,7 +971,7 @@ static int pci_pm_poweroff_noirq(struct device *dev)
                         return error;
         }
 
-        if (!pci_dev->state_saved && !pci_is_bridge(pci_dev))
+        if (!pci_dev->state_saved && !pci_has_subordinate(pci_dev))
                 pci_prepare_to_sleep(pci_dev);
 
         /*