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>

1 files changed, 1 insertions, 13 deletions

diff --git a/drivers/s390/scsi/zfcp_fc.h b/drivers/s390/scsi/zfcp_fc.h
index b1d2024ed513..df2b541c8287 100644
--- a/drivers/s390/scsi/zfcp_fc.h
+++ b/drivers/s390/scsi/zfcp_fc.h
@@ -212,8 +212,6 @@ static inline
 void zfcp_fc_scsi_to_fcp(struct fcp_cmnd *fcp, struct scsi_cmnd *scsi,
                          u8 tm_flags)
 {
-        char tag[2];
-
         int_to_scsilun(scsi->device->lun, (struct scsi_lun *) &fcp->fc_lun);
 
         if (unlikely(tm_flags)) {
@@ -221,17 +219,7 @@ void zfcp_fc_scsi_to_fcp(struct fcp_cmnd *fcp, struct scsi_cmnd *scsi,
                 return;
         }
 
-        if (scsi_populate_tag_msg(scsi, tag)) {
-                switch (tag[0]) {
-                case MSG_ORDERED_TAG:
-                        fcp->fc_pri_ta |= FCP_PTA_ORDERED;
-                        break;
-                case MSG_SIMPLE_TAG:
-                        fcp->fc_pri_ta |= FCP_PTA_SIMPLE;
-                        break;
-                };
-        } else
-                fcp->fc_pri_ta = FCP_PTA_SIMPLE;
+        fcp->fc_pri_ta = FCP_PTA_SIMPLE;
 
         if (scsi->sc_data_direction == DMA_FROM_DEVICE)
                 fcp->fc_flags |= FCP_CFL_RDDATA;