[SCSI] sr: use block layer runtime PM

[cascardo/linux.git] / drivers / scsi / sr.c

diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 119d67f..40d8592 100644 (file)
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -161,14 +161,10 @@ static inline struct scsi_cd *scsi_cd_get(struct gendisk *disk)
                goto out;
        cd = scsi_cd(disk);
        kref_get(&cd->kref);
-       if (scsi_device_get(cd->device))
-               goto out_put;
-       if (!scsi_autopm_get_device(cd->device))
-               goto out;
-
- out_put:
-       kref_put(&cd->kref, sr_kref_release);
-       cd = NULL;
+       if (scsi_device_get(cd->device)) {
+               kref_put(&cd->kref, sr_kref_release);
+               cd = NULL;
+       }
  out:
        mutex_unlock(&sr_ref_mutex);
        return cd;
@@ -180,7 +176,6 @@ static void scsi_cd_put(struct scsi_cd *cd)
 
        mutex_lock(&sr_ref_mutex);
        kref_put(&cd->kref, sr_kref_release);
-       scsi_autopm_put_device(sdev);
        scsi_device_put(sdev);
        mutex_unlock(&sr_ref_mutex);
 }
@@ -558,8 +553,6 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
        void __user *argp = (void __user *)arg;
        int ret;
 
-       scsi_autopm_get_device(cd->device);
-
        mutex_lock(&sr_mutex);
 
        /*
@@ -591,7 +584,6 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
 
 out:
        mutex_unlock(&sr_mutex);
-       scsi_autopm_put_device(cd->device);
        return ret;
 }
 
@@ -599,17 +591,11 @@ static unsigned int sr_block_check_events(struct gendisk *disk,
                                          unsigned int clearing)
 {
        struct scsi_cd *cd = scsi_cd(disk);
-       unsigned int ret;
 
-       if (atomic_read(&cd->device->disk_events_disable_depth) == 0) {
-               scsi_autopm_get_device(cd->device);
-               ret = cdrom_check_events(&cd->cdi, clearing);
-               scsi_autopm_put_device(cd->device);
-       } else {
-               ret = 0;
-       }
+       if (atomic_read(&cd->device->disk_events_disable_depth))
+               return 0;
 
-       return ret;
+       return cdrom_check_events(&cd->cdi, clearing);
 }
 
 static int sr_block_revalidate_disk(struct gendisk *disk)
@@ -617,8 +603,6 @@ static int sr_block_revalidate_disk(struct gendisk *disk)
        struct scsi_cd *cd = scsi_cd(disk);
        struct scsi_sense_hdr sshdr;
 
-       scsi_autopm_get_device(cd->device);
-
        /* if the unit is not ready, nothing more to do */
        if (scsi_test_unit_ready(cd->device, SR_TIMEOUT, MAX_RETRIES, &sshdr))
                goto out;
@@ -626,7 +610,6 @@ static int sr_block_revalidate_disk(struct gendisk *disk)
        sr_cd_check(&cd->cdi);
        get_sectorsize(cd);
 out:
-       scsi_autopm_put_device(cd->device);
        return 0;
 }
 
@@ -747,6 +730,12 @@ static int sr_probe(struct device *dev)
        if (register_cdrom(&cd->cdi))
                goto fail_put;
 
+       /*
+        * Initialize block layer runtime PM stuffs before the
+        * periodic event checking request gets started in add_disk.
+        */
+       blk_pm_runtime_init(sdev->request_queue, dev);
+
        dev_set_drvdata(dev, cd);
        disk->flags |= GENHD_FL_REMOVABLE;
        add_disk(disk);