diff options
| author | Christoph Hellwig <hch@lst.de> | 2014-10-30 14:30:06 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2014-11-12 11:19:41 +0100 |
| commit | 5066863337afdb0ad7323f424f7959d9f9f066da (patch) | |
| tree | 3901d3088c8698f10e1533298ae04a98116bc395 /include/scsi | |
| parent | abd0c533e37789ef56a73562d6d06d39897bd801 (diff) | |
| download | op-kernel-dev-5066863337afdb0ad7323f424f7959d9f9f066da.zip op-kernel-dev-5066863337afdb0ad7323f424f7959d9f9f066da.tar.gz | |
scsi: remove abuses of scsi_populate_tag
Unless we want to build a SPI tag message we should just check SCMD_TAGGED
instead of reverse engineering a tag type through the use of
scsi_populate_tag_msg.
Also rename the function to spi_populate_tag_msg, make it behave like the
other spi message helpers, and move it to the spi transport class.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Diffstat (limited to 'include/scsi')
| -rw-r--r-- | include/scsi/scsi_tcq.h | 21 | ||||
| -rw-r--r-- | include/scsi/scsi_transport_spi.h | 1 |
2 files changed, 1 insertions, 21 deletions
diff --git a/include/scsi/scsi_tcq.h b/include/scsi/scsi_tcq.h index 342f38c..005f68d 100644 --- a/include/scsi/scsi_tcq.h +++ b/include/scsi/scsi_tcq.h @@ -80,27 +80,6 @@ static inline void scsi_deactivate_tcq(struct scsi_device *sdev, int depth) scsi_adjust_queue_depth(sdev, 0, depth); } -/** - * scsi_populate_tag_msg - place a tag message in a buffer - * @SCpnt: pointer to the Scsi_Cmnd for the tag - * @msg: pointer to the area to place the tag - * - * Notes: - * designed to create the correct type of tag message for the - * particular request. Returns the size of the tag message. - * May return 0 if TCQ is disabled for this device. - **/ -static inline int scsi_populate_tag_msg(struct scsi_cmnd *cmd, char *msg) -{ - if (cmd->flags & SCMD_TAGGED) { - *msg++ = MSG_SIMPLE_TAG; - *msg++ = cmd->request->tag; - return 2; - } - - return 0; -} - static inline struct scsi_cmnd *scsi_mq_find_tag(struct Scsi_Host *shost, int unique_tag) { diff --git a/include/scsi/scsi_transport_spi.h b/include/scsi/scsi_transport_spi.h index 7497a38..a4fa52b 100644 --- a/include/scsi/scsi_transport_spi.h +++ b/include/scsi/scsi_transport_spi.h @@ -157,5 +157,6 @@ int spi_populate_width_msg(unsigned char *msg, int width); int spi_populate_sync_msg(unsigned char *msg, int period, int offset); int spi_populate_ppr_msg(unsigned char *msg, int period, int offset, int width, int options); +int spi_populate_tag_msg(unsigned char *msg, struct scsi_cmnd *cmd); #endif /* SCSI_TRANSPORT_SPI_H */ |
