scsi: remove scsi_get_tag_type

Both remaining users are better of just checking sdev->simple_tags
directly.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com
Reviewed-by: Hannes Reinecke <hare@suse.de>

diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c
index e7229114b52da805a33ebe1350d0366295849248..2c87a7ac1d8602bc01434cb801c71310fd8c97ba 100644 (file)
--- a/drivers/scsi/53c700.c
+++ b/drivers/scsi/53c700.c
@@ -1816,8 +1816,8 @@ NCR_700_queuecommand_lck(struct scsi_cmnd *SCp, void (*done)(struct scsi_cmnd *)
                hostdata->tag_negotiated &= ~(1<<scmd_id(SCp));
        }
 
-       if((hostdata->tag_negotiated &(1<<scmd_id(SCp)))
-          && scsi_get_tag_type(SCp->device)) {
+       if ((hostdata->tag_negotiated & (1<<scmd_id(SCp))) &&
+           SCp->device->simple_tags) {
                slot->tag = SCp->request->tag;
                CDEBUG(KERN_DEBUG, SCp, "sending out tag %d, slot %p\n",
                       slot->tag, slot);

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index c35ef5f01e925ed88a5586070564d7931958cc4f..c91c7c5da5696c9ef00da6fc89da257c4cfe0a43 100644 (file)
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -5755,7 +5755,7 @@ static void ipr_erp_cancel_all(struct ipr_cmnd *ipr_cmd)
 
        ipr_reinit_ipr_cmnd_for_erp(ipr_cmd);
 
-       if (!scsi_get_tag_type(scsi_cmd->device)) {
+       if (!scsi_cmd->device->simple_tags) {
                ipr_erp_request_sense(ipr_cmd);
                return;
        }

diff --git a/include/scsi/scsi_tcq.h b/include/scsi/scsi_tcq.h
index 59578beac053015085b4015485ece200b65b4c6c..681e010c2c4867138e6ccd0e669e810f2489e177 100644 (file)
--- a/include/scsi/scsi_tcq.h
+++ b/include/scsi/scsi_tcq.h
@@ -15,19 +15,6 @@
 
 
 #ifdef CONFIG_BLOCK
-/**
- * scsi_get_tag_type - get the type of tag the device supports
- * @sdev:      the scsi device
- */
-static inline int scsi_get_tag_type(struct scsi_device *sdev)
-{
-       if (!sdev->tagged_supported)
-               return 0;
-       if (sdev->simple_tags)
-               return MSG_SIMPLE_TAG;
-       return 0;
-}
-
 static inline void scsi_set_tag_type(struct scsi_device *sdev, int tag)
 {
        switch (tag) {