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 0664652513
("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>
This commit is contained in:
parent
a45a1f3614
commit
7760e22350
@ -315,8 +315,6 @@ static void scsi_host_dev_release(struct device *dev)
|
|||||||
{
|
{
|
||||||
struct Scsi_Host *shost = dev_to_shost(dev);
|
struct Scsi_Host *shost = dev_to_shost(dev);
|
||||||
struct device *parent = dev->parent;
|
struct device *parent = dev->parent;
|
||||||
struct request_queue *q;
|
|
||||||
void *queuedata;
|
|
||||||
|
|
||||||
scsi_proc_hostdir_rm(shost->hostt);
|
scsi_proc_hostdir_rm(shost->hostt);
|
||||||
|
|
||||||
@ -326,12 +324,6 @@ static void scsi_host_dev_release(struct device *dev)
|
|||||||
kthread_stop(shost->ehandler);
|
kthread_stop(shost->ehandler);
|
||||||
if (shost->work_q)
|
if (shost->work_q)
|
||||||
destroy_workqueue(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) {
|
if (shost->shost_state == SHOST_CREATED) {
|
||||||
/*
|
/*
|
||||||
|
@ -691,12 +691,6 @@ struct Scsi_Host {
|
|||||||
unsigned int prot_capabilities;
|
unsigned int prot_capabilities;
|
||||||
unsigned char prot_guard_type;
|
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 */
|
/* legacy crap */
|
||||||
unsigned long base;
|
unsigned long base;
|
||||||
unsigned long io_port;
|
unsigned long io_port;
|
||||||
|
Loading…
Reference in New Issue
Block a user