1 files changed, 8 insertions, 10 deletions

diff --git a/arch/s390/pci/pci_sysfs.c b/arch/s390/pci/pci_sysfs.c
index cf8a12ff733b..ab4a91393005 100644
--- a/arch/s390/pci/pci_sysfs.c
+++ b/arch/s390/pci/pci_sysfs.c
@@ -48,29 +48,27 @@ static ssize_t show_pfgid(struct device *dev, struct device_attribute *attr,
 }
 static DEVICE_ATTR(pfgid, S_IRUGO, show_pfgid, NULL);
 
-static void recover_callback(struct device *dev)
+static ssize_t store_recover(struct device *dev, struct device_attribute *attr,
+                             const char *buf, size_t count)
 {
         struct pci_dev *pdev = to_pci_dev(dev);
         struct zpci_dev *zdev = get_zdev(pdev);
         int ret;
 
+        if (!device_remove_file_self(dev, attr))
+                return count;
+
         pci_stop_and_remove_bus_device(pdev);
         ret = zpci_disable_device(zdev);
         if (ret)
-                return;
+                return ret;
 
         ret = zpci_enable_device(zdev);
         if (ret)
-                return;
+                return ret;
 
         pci_rescan_bus(zdev->bus);
-}
-
-static ssize_t store_recover(struct device *dev, struct device_attribute *attr,
-                             const char *buf, size_t count)
-{
-        int rc = device_schedule_callback(dev, recover_callback);
-        return rc ? rc : count;
+        return count;
 }
 static DEVICE_ATTR(recover, S_IWUSR, NULL, store_recover);