scsi: remove current_cmnd field from struct scsi_device
The field is only used by the 53c700 driver, so move it into the driver-private device data instead of having it in the common structure. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Tomas Henzl <thenzl@redhat.com> Reviewed-by: Ewan D. Milne <emilne@redhat.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:

committed by
Martin K. Petersen

szülő
d9083160c2
commit
68350a886e
@@ -1120,9 +1120,9 @@ process_script_interrupt(__u32 dsps, __u32 dsp, struct scsi_cmnd *SCp,
|
||||
"reselection is tag %d, slot %p(%d)\n",
|
||||
hostdata->msgin[2], slot, slot->tag);
|
||||
} else {
|
||||
struct scsi_cmnd *SCp;
|
||||
struct NCR_700_Device_Parameters *p = SDp->hostdata;
|
||||
struct scsi_cmnd *SCp = p->current_cmnd;
|
||||
|
||||
SCp = SDp->current_cmnd;
|
||||
if(unlikely(SCp == NULL)) {
|
||||
sdev_printk(KERN_ERR, SDp,
|
||||
"no saved request for untagged cmd\n");
|
||||
@@ -1825,9 +1825,11 @@ NCR_700_queuecommand_lck(struct scsi_cmnd *SCp, void (*done)(struct scsi_cmnd *)
|
||||
CDEBUG(KERN_DEBUG, SCp, "sending out tag %d, slot %p\n",
|
||||
slot->tag, slot);
|
||||
} else {
|
||||
struct NCR_700_Device_Parameters *p = SCp->device->hostdata;
|
||||
|
||||
slot->tag = SCSI_NO_TAG;
|
||||
/* save current command for reselection */
|
||||
SCp->device->current_cmnd = SCp;
|
||||
p->current_cmnd = SCp;
|
||||
}
|
||||
/* sanity check: some of the commands generated by the mid-layer
|
||||
* have an eccentric idea of their sc_data_direction */
|
||||
|
Reference in New Issue
Block a user