Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68350a88 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin K. Petersen
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Reviewed-by: default avatarEwan D. Milne <emilne@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent d9083160

drivers/scsi/53c700.c

+5 −3
Original line number Diff line number Diff line
@@ -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 */

drivers/scsi/53c700.h

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ struct NCR_700_Device_Parameters { 
	 * cmnd[1], this could be in static storage */

	unsigned char cmnd[MAX_COMMAND_SIZE];

	__u8	depth;

	struct scsi_cmnd *current_cmnd;	/* currently active command */

};

include/scsi/scsi_device.h

+0 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ struct scsi_device { 
	spinlock_t list_lock;

	struct list_head cmd_list;	/* queue of in use SCSI Command structures */

	struct list_head starved_entry;

	struct scsi_cmnd *current_cmnd;	/* currently active command */

	unsigned short queue_depth;	/* How deep of a queue we want */

	unsigned short max_queue_depth;	/* max queue depth */

	unsigned short last_queue_full_depth; /* These two are used by */