pci: use device_remove_file_self() instead of device_schedule_callback()

driver-core now supports synchrnous self-deletion of attributes and
the asynchrnous removal mechanism is scheduled for removal.  Use it
instead of device_schedule_callback().  This makes "remove" behave
synchronously.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 6 insertions, 18 deletions

diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index c91e6c18debc..94d1cb819eb6 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -352,32 +352,20 @@ static struct device_attribute dev_rescan_attr = __ATTR(rescan,
                                                         (S_IWUSR|S_IWGRP),
                                                         NULL, dev_rescan_store);
 
-static void remove_callback(struct device *dev)
-{
-        struct pci_dev *pdev = to_pci_dev(dev);
-
-        mutex_lock(&pci_remove_rescan_mutex);
-        pci_stop_and_remove_bus_device(pdev);
-        mutex_unlock(&pci_remove_rescan_mutex);
-}
-
 static ssize_t
-remove_store(struct device *dev, struct device_attribute *dummy,
+remove_store(struct device *dev, struct device_attribute *attr,
              const char *buf, size_t count)
 {
-        int ret = 0;
         unsigned long val;
 
         if (kstrtoul(buf, 0, &val) < 0)
                 return -EINVAL;
 
-        /* An attribute cannot be unregistered by one of its own methods,
-         * so we have to use this roundabout approach.
-         */
-        if (val)
-                ret = device_schedule_callback(dev, remove_callback);
-        if (ret)
-                count = ret;
+        if (val && device_remove_file_self(dev, attr)) {
+                mutex_lock(&pci_remove_rescan_mutex);
+                pci_stop_and_remove_bus_device(to_pci_dev(dev));
+                mutex_unlock(&pci_remove_rescan_mutex);
+        }
         return count;
 }
 static struct device_attribute dev_remove_attr = __ATTR(remove,