[SCSI] Revert "[SCSI] runtime resume parent for child's system-resume"

This reverts commit 28fd00d42cca178638f51c08efa986a777c24a4b.

With commit 88d26136a256576e444db312179e17af6dd0ea87 (PM: Prevent
runtime suspend during system resume), this patch is no longer needed.

Signed-off-by: Aaron Lu <aaron.lu@intel.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c
index d4201ded3b2203c0bd9cc17d8a26b528f5ccfc2c..9923b262263d1c9e54fb15285663c6b95b8b8a95 100644 (file)
--- a/drivers/scsi/scsi_pm.c
+++ b/drivers/scsi/scsi_pm.c
@@ -76,17 +76,8 @@ static int scsi_bus_resume_common(struct device *dev)
 {
        int err = 0;
 
-       if (scsi_is_sdev_device(dev)) {
-               /*
-                * Parent device may have runtime suspended as soon as
-                * it is woken up during the system resume.
-                *
-                * Resume it on behalf of child.
-                */
-               pm_runtime_get_sync(dev->parent);
+       if (scsi_is_sdev_device(dev))
                err = scsi_dev_type_resume(dev);
-               pm_runtime_put_sync(dev->parent);
-       }
 
        if (err == 0) {
                pm_runtime_disable(dev);