4 files changed, 5 insertions, 5 deletions

diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index 68f91a252595..97a8194063b5 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -184,7 +184,7 @@ void pci_enable_bridges(struct pci_bus *bus)
 
         list_for_each_entry(dev, &bus->devices, bus_list) {
                 if (dev->subordinate) {
-                        if (atomic_read(&dev->enable_cnt) == 0) {
+                        if (!pci_is_enabled(dev)) {
                                 retval = pci_enable_device(dev);
                                 pci_set_master(dev);
                         }
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index e9a8706a6401..cd8e682c04aa 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -148,7 +148,7 @@ static ssize_t is_enabled_store(struct device *dev,
                 return -EPERM;
 
         if (!val) {
-                if (atomic_read(&pdev->enable_cnt) != 0)
+                if (pci_is_enabled(pdev))
                         pci_disable_device(pdev);
                 else
                         result = -EIO;
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 445fb6f7ea3f..16fd0d4c3166 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -844,7 +844,7 @@ static int do_pci_enable_device(struct pci_dev *dev, int bars)
  */
 int pci_reenable_device(struct pci_dev *dev)
 {
-        if (atomic_read(&dev->enable_cnt))
+        if (pci_is_enabled(dev))
                 return do_pci_enable_device(dev, (1 << PCI_NUM_RESOURCES) - 1);
         return 0;
 }
@@ -1042,7 +1042,7 @@ static void do_pci_disable_device(struct pci_dev *dev)
  */
 void pci_disable_enabled_device(struct pci_dev *dev)
 {
-        if (atomic_read(&dev->enable_cnt))
+        if (pci_is_enabled(dev))
                 do_pci_disable_device(dev);
 }
 
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 334285a8e237..8d9da9d30a61 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -144,7 +144,7 @@ static void pci_setup_bridge(struct pci_bus *bus)
         struct pci_bus_region region;
         u32 l, bu, lu, io_upper16;
 
-        if (!pci_is_root_bus(bus) && bus->is_added)
+        if (pci_is_enabled(bridge))
                 return;
 
         dev_info(&bridge->dev, "PCI bridge, secondary bus %04x:%02x\n",