Uses block layer runtime pm helper functions in scsi_runtime_suspend/resume. Remove scsi_autopm_* from sd open/release path. Signed-off-by: Lin Ming <ming.m.lin@xxxxxxxxx> --- v4: - Update queue pm status in scsi_bus_resume_common drivers/scsi/scsi_pm.c | 32 +++++++++++++++++++++++++------- drivers/scsi/scsi_sysfs.c | 2 ++ drivers/scsi/sd.c | 7 ------- 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c index d2a80de..aa43fa2 100644 --- a/drivers/scsi/scsi_pm.c +++ b/drivers/scsi/scsi_pm.c @@ -77,6 +77,9 @@ static int scsi_bus_resume_common(struct device *dev) int err = 0; if (scsi_is_sdev_device(dev)) { + struct scsi_device *sdev = to_scsi_device(dev); + struct request_queue *q = sdev->request_queue; + /* * Parent device may have runtime suspended as soon as * it is woken up during the system resume. @@ -84,12 +87,14 @@ static int scsi_bus_resume_common(struct device *dev) * Resume it on behalf of child. */ pm_runtime_get_sync(dev->parent); + blk_pre_runtime_resume(q); err = scsi_dev_type_resume(dev); if (err == 0) { pm_runtime_disable(dev); pm_runtime_set_active(dev); pm_runtime_enable(dev); } + blk_post_runtime_resume(q, err); pm_runtime_put_sync(dev->parent); } @@ -142,10 +147,16 @@ static int scsi_runtime_suspend(struct device *dev) dev_dbg(dev, "scsi_runtime_suspend\n"); if (scsi_is_sdev_device(dev)) { + struct scsi_device *sdev = to_scsi_device(dev); + struct request_queue *q = sdev->request_queue; + + err = blk_pre_runtime_suspend(q); + if (err) + return err; + err = scsi_dev_type_suspend(dev, PMSG_AUTO_SUSPEND); - if (err == -EAGAIN) - pm_schedule_suspend(dev, jiffies_to_msecs( - round_jiffies_up_relative(HZ/10))); + + blk_post_runtime_suspend(q, err); } /* Insert hooks here for targets, hosts, and transport classes */ @@ -158,8 +169,14 @@ static int scsi_runtime_resume(struct device *dev) int err = 0; dev_dbg(dev, "scsi_runtime_resume\n"); - if (scsi_is_sdev_device(dev)) + if (scsi_is_sdev_device(dev)) { + struct scsi_device *sdev = to_scsi_device(dev); + struct request_queue *q = sdev->request_queue; + + blk_pre_runtime_resume(q); err = scsi_dev_type_resume(dev); + blk_post_runtime_resume(q, err); + } /* Insert hooks here for targets, hosts, and transport classes */ @@ -174,9 +191,10 @@ static int scsi_runtime_idle(struct device *dev) /* Insert hooks here for targets, hosts, and transport classes */ - if (scsi_is_sdev_device(dev)) - err = pm_schedule_suspend(dev, 100); - else + if (scsi_is_sdev_device(dev)) { + pm_runtime_mark_last_busy(dev); + err = pm_runtime_autosuspend(dev); + } else err = pm_runtime_suspend(dev); return err; } diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 04c2a27..1e8975f 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -895,6 +895,8 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev) */ scsi_autopm_get_device(sdev); + blk_pm_runtime_init(rq, &sdev->sdev_gendev); + error = device_add(&sdev->sdev_gendev); if (error) { sdev_printk(KERN_INFO, sdev, diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index bf8413a..bf9f4e8 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -967,10 +967,6 @@ static int sd_open(struct block_device *bdev, fmode_t mode) sdev = sdkp->device; - retval = scsi_autopm_get_device(sdev); - if (retval) - goto error_autopm; - /* * If the device is in error recovery, wait until it is done. * If the device is offline, then disallow any access to it. @@ -1015,8 +1011,6 @@ static int sd_open(struct block_device *bdev, fmode_t mode) return 0; error_out: - scsi_autopm_put_device(sdev); -error_autopm: scsi_disk_put(sdkp); return retval; } @@ -1051,7 +1045,6 @@ static int sd_release(struct gendisk *disk, fmode_t mode) * XXX is followed by a "rmmod sd_mod"? */ - scsi_autopm_put_device(sdev); scsi_disk_put(sdkp); return 0; } -- 1.7.10 -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html