2 files changed, 1 insertions, 16 deletions

diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c
index 2c87a7ac1d86..82abfce1cb42 100644
--- a/drivers/scsi/53c700.c
+++ b/drivers/scsi/53c700.c
@@ -902,8 +902,8 @@ process_message(struct Scsi_Host *host,	struct NCR_700_Host_Parameters *hostdata
                         hostdata->tag_negotiated &= ~(1<<scmd_id(SCp));
 
                         SCp->device->tagged_supported = 0;
+                        SCp->device->simple_tags = 0;
                         scsi_change_queue_depth(SCp->device, host->cmd_per_lun);
-                        scsi_set_tag_type(SCp->device, 0);
                 } else {
                         shost_printk(KERN_WARNING, host,
                                 "(%d:%d) Unexpected REJECT Message %s\n",
diff --git a/include/scsi/scsi_tcq.h b/include/scsi/scsi_tcq.h
index 681e010c2c48..e624acabd7a0 100644
--- a/include/scsi/scsi_tcq.h
+++ b/include/scsi/scsi_tcq.h
@@ -15,21 +15,6 @@
 
 
 #ifdef CONFIG_BLOCK
-static inline void scsi_set_tag_type(struct scsi_device *sdev, int tag)
-{
-        switch (tag) {
-        case MSG_ORDERED_TAG:
-        case MSG_SIMPLE_TAG:
-                sdev->simple_tags = 1;
-                break;
-        case 0:
-                /* fall through */
-        default:
-                sdev->simple_tags = 0;
-                break;
-        }
-}
-
 static inline struct scsi_cmnd *scsi_mq_find_tag(struct Scsi_Host *shost,
                                                  int unique_tag)
 {