1 files changed, 1 insertions, 5 deletions

diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index e9a8706a6401..a7eb1b46a5a8 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;
@@ -277,14 +277,10 @@ remove_store(struct device *dev, struct device_attribute *dummy,
 {
         int ret = 0;
         unsigned long val;
-        struct pci_dev *pdev = to_pci_dev(dev);
 
         if (strict_strtoul(buf, 0, &val) < 0)
                 return -EINVAL;
 
-        if (pci_is_root_bus(pdev->bus))
-                return -EBUSY;
-
         /* An attribute cannot be unregistered by one of its own methods,
          * so we have to use this roundabout approach.
          */