scsi: Remove Scsi_Host.uspace_req_q

A patch I wrote myself several years ago removed SCSI target support
from the code under drivers/scsi. That patch removed the code that sets
uspace_req_q to a non-NULL value. Hence also remove the code that
depends on uspace_req_q != NULL.

References: commit 066465251303 ("tgt: removal")
Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 831a1c8b9f89f4e4eb7376dfde91450f0105e022..fe3a0da3ec9783ce47ae6f8747c0c9669539ff75 100644 (file)
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -315,8 +315,6 @@ static void scsi_host_dev_release(struct device *dev)
 {
        struct Scsi_Host *shost = dev_to_shost(dev);
        struct device *parent = dev->parent;
-       struct request_queue *q;
-       void *queuedata;
 
        scsi_proc_hostdir_rm(shost->hostt);
 
@@ -326,12 +324,6 @@ static void scsi_host_dev_release(struct device *dev)
                kthread_stop(shost->ehandler);
        if (shost->work_q)
                destroy_workqueue(shost->work_q);
-       q = shost->uspace_req_q;
-       if (q) {
-               queuedata = q->queuedata;
-               blk_cleanup_queue(q);
-               kfree(queuedata);
-       }
 
        if (shost->shost_state == SHOST_CREATED) {
                /*

diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index afb04811b7b9c578f24d8360ace4f85efa07632c..0a804b1a47267d5195deff92dba1f637d9de5bef 100644 (file)
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -691,12 +691,6 @@ struct Scsi_Host {
        unsigned int prot_capabilities;
        unsigned char prot_guard_type;
 
-       /*
-        * q used for scsi_tgt msgs, async events or any other requests that
-        * need to be processed in userspace
-        */
-       struct request_queue *uspace_req_q;
-
        /* legacy crap */
        unsigned long base;
        unsigned long io_port;