Merge branch 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[linux-2.6-microblaze.git] / drivers / scsi / scsi_dh.c

diff --git a/drivers/scsi/scsi_dh.c b/drivers/scsi/scsi_dh.c
index b8d3b97..84addee 100644 (file)
--- a/drivers/scsi/scsi_dh.c
+++ b/drivers/scsi/scsi_dh.c
@@ -219,20 +219,6 @@ int scsi_unregister_device_handler(struct scsi_device_handler *scsi_dh)
 }
 EXPORT_SYMBOL_GPL(scsi_unregister_device_handler);
 
-static struct scsi_device *get_sdev_from_queue(struct request_queue *q)
-{
-       struct scsi_device *sdev;
-       unsigned long flags;
-
-       spin_lock_irqsave(q->queue_lock, flags);
-       sdev = q->queuedata;
-       if (!sdev || !get_device(&sdev->sdev_gendev))
-               sdev = NULL;
-       spin_unlock_irqrestore(q->queue_lock, flags);
-
-       return sdev;
-}
-
 /*
  * scsi_dh_activate - activate the path associated with the scsi_device
  *      corresponding to the given request queue.
@@ -251,7 +237,7 @@ int scsi_dh_activate(struct request_queue *q, activate_complete fn, void *data)
        struct scsi_device *sdev;
        int err = SCSI_DH_NOSYS;
 
-       sdev = get_sdev_from_queue(q);
+       sdev = scsi_device_from_queue(q);
        if (!sdev) {
                if (fn)
                        fn(data, err);
@@ -298,7 +284,7 @@ int scsi_dh_set_params(struct request_queue *q, const char *params)
        struct scsi_device *sdev;
        int err = -SCSI_DH_NOSYS;
 
-       sdev = get_sdev_from_queue(q);
+       sdev = scsi_device_from_queue(q);
        if (!sdev)
                return err;
 
@@ -321,7 +307,7 @@ int scsi_dh_attach(struct request_queue *q, const char *name)
        struct scsi_device_handler *scsi_dh;
        int err = 0;
 
-       sdev = get_sdev_from_queue(q);
+       sdev = scsi_device_from_queue(q);
        if (!sdev)
                return -ENODEV;
 
@@ -359,7 +345,7 @@ const char *scsi_dh_attached_handler_name(struct request_queue *q, gfp_t gfp)
        struct scsi_device *sdev;
        const char *handler_name = NULL;
 
-       sdev = get_sdev_from_queue(q);
+       sdev = scsi_device_from_queue(q);
        if (!sdev)
                return NULL;