1 files changed, 19 insertions, 49 deletions

diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index c23ab978c3ba..562fb3bce261 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -11,6 +11,7 @@
 #include <linux/init.h>
 #include <linux/blkdev.h>
 #include <linux/device.h>
+#include <linux/pm_runtime.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_device.h>
@@ -376,57 +377,11 @@ static int scsi_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
         return 0;
 }
 
-static int scsi_bus_suspend(struct device * dev, pm_message_t state)
-{
-        struct device_driver *drv;
-        struct scsi_device *sdev;
-        int err;
-
-        if (dev->type != &scsi_dev_type)
-                return 0;
-
-        drv = dev->driver;
-        sdev = to_scsi_device(dev);
-
-        err = scsi_device_quiesce(sdev);
-        if (err)
-                return err;
-
-        if (drv && drv->suspend) {
-                err = drv->suspend(dev, state);
-                if (err)
-                        return err;
-        }
-
-        return 0;
-}
-
-static int scsi_bus_resume(struct device * dev)
-{
-        struct device_driver *drv;
-        struct scsi_device *sdev;
-        int err = 0;
-
-        if (dev->type != &scsi_dev_type)
-                return 0;
-
-        drv = dev->driver;
-        sdev = to_scsi_device(dev);
-
-        if (drv && drv->resume)
-                err = drv->resume(dev);
-
-        scsi_device_resume(sdev);
-
-        return err;
-}
-
 struct bus_type scsi_bus_type = {
         .name           = "scsi",
         .match          = scsi_bus_match,
         .uevent         = scsi_bus_uevent,
-        .suspend        = scsi_bus_suspend,
-        .resume         = scsi_bus_resume,
+        .pm             = &scsi_bus_pm_ops,
 };
 EXPORT_SYMBOL_GPL(scsi_bus_type);
 
@@ -848,8 +803,6 @@ static int scsi_target_add(struct scsi_target *starget)
         if (starget->state != STARGET_CREATED)
                 return 0;
 
-        device_enable_async_suspend(&starget->dev);
-
         error = device_add(&starget->dev);
         if (error) {
                 dev_err(&starget->dev, "target device_add failed, error %d\n", error);
@@ -858,6 +811,10 @@ static int scsi_target_add(struct scsi_target *starget)
         transport_add_device(&starget->dev);
         starget->state = STARGET_RUNNING;
 
+        pm_runtime_set_active(&starget->dev);
+        pm_runtime_enable(&starget->dev);
+        device_enable_async_suspend(&starget->dev);
+
         return 0;
 }
 
@@ -887,7 +844,20 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev)
                 return error;
 
         transport_configure_device(&starget->dev);
+
         device_enable_async_suspend(&sdev->sdev_gendev);
+        scsi_autopm_get_target(starget);
+        pm_runtime_set_active(&sdev->sdev_gendev);
+        pm_runtime_forbid(&sdev->sdev_gendev);
+        pm_runtime_enable(&sdev->sdev_gendev);
+        scsi_autopm_put_target(starget);
+
+        /* The following call will keep sdev active indefinitely, until
+         * its driver does a corresponding scsi_autopm_pm_device().  Only
+         * drivers supporting autosuspend will do this.
+         */
+        scsi_autopm_get_device(sdev);
+
         error = device_add(&sdev->sdev_gendev);
         if (error) {
                 printk(KERN_INFO "error 1\n");