diff options
Diffstat (limited to 'drivers/scsi/53c700.c')
-rw-r--r-- | drivers/scsi/53c700.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c index aa915da2a5e5..e7229114b52d 100644 --- a/drivers/scsi/53c700.c +++ b/drivers/scsi/53c700.c | |||
@@ -176,7 +176,6 @@ STATIC int NCR_700_slave_alloc(struct scsi_device *SDpnt); | |||
176 | STATIC int NCR_700_slave_configure(struct scsi_device *SDpnt); | 176 | STATIC int NCR_700_slave_configure(struct scsi_device *SDpnt); |
177 | STATIC void NCR_700_slave_destroy(struct scsi_device *SDpnt); | 177 | STATIC void NCR_700_slave_destroy(struct scsi_device *SDpnt); |
178 | static int NCR_700_change_queue_depth(struct scsi_device *SDpnt, int depth); | 178 | static int NCR_700_change_queue_depth(struct scsi_device *SDpnt, int depth); |
179 | static int NCR_700_change_queue_type(struct scsi_device *SDpnt, int depth); | ||
180 | 179 | ||
181 | STATIC struct device_attribute *NCR_700_dev_attrs[]; | 180 | STATIC struct device_attribute *NCR_700_dev_attrs[]; |
182 | 181 | ||
@@ -326,7 +325,6 @@ NCR_700_detect(struct scsi_host_template *tpnt, | |||
326 | tpnt->slave_destroy = NCR_700_slave_destroy; | 325 | tpnt->slave_destroy = NCR_700_slave_destroy; |
327 | tpnt->slave_alloc = NCR_700_slave_alloc; | 326 | tpnt->slave_alloc = NCR_700_slave_alloc; |
328 | tpnt->change_queue_depth = NCR_700_change_queue_depth; | 327 | tpnt->change_queue_depth = NCR_700_change_queue_depth; |
329 | tpnt->change_queue_type = NCR_700_change_queue_type; | ||
330 | tpnt->use_blk_tags = 1; | 328 | tpnt->use_blk_tags = 1; |
331 | 329 | ||
332 | if(tpnt->name == NULL) | 330 | if(tpnt->name == NULL) |
@@ -2082,39 +2080,6 @@ NCR_700_change_queue_depth(struct scsi_device *SDp, int depth) | |||
2082 | return scsi_change_queue_depth(SDp, depth); | 2080 | return scsi_change_queue_depth(SDp, depth); |
2083 | } | 2081 | } |
2084 | 2082 | ||
2085 | static int NCR_700_change_queue_type(struct scsi_device *SDp, int tag_type) | ||
2086 | { | ||
2087 | int change_tag = ((tag_type ==0 && scsi_get_tag_type(SDp) != 0) | ||
2088 | || (tag_type != 0 && scsi_get_tag_type(SDp) == 0)); | ||
2089 | struct NCR_700_Host_Parameters *hostdata = | ||
2090 | (struct NCR_700_Host_Parameters *)SDp->host->hostdata[0]; | ||
2091 | |||
2092 | /* We have a global (per target) flag to track whether TCQ is | ||
2093 | * enabled, so we'll be turning it off for the entire target here. | ||
2094 | * our tag algorithm will fail if we mix tagged and untagged commands, | ||
2095 | * so quiesce the device before doing this */ | ||
2096 | if (change_tag) | ||
2097 | scsi_target_quiesce(SDp->sdev_target); | ||
2098 | |||
2099 | scsi_set_tag_type(SDp, tag_type); | ||
2100 | if (!tag_type) { | ||
2101 | /* shift back to the default unqueued number of commands | ||
2102 | * (the user can still raise this) */ | ||
2103 | scsi_change_queue_depth(SDp, SDp->host->cmd_per_lun); | ||
2104 | hostdata->tag_negotiated &= ~(1 << sdev_id(SDp)); | ||
2105 | } else { | ||
2106 | /* Here, we cleared the negotiation flag above, so this | ||
2107 | * will force the driver to renegotiate */ | ||
2108 | scsi_change_queue_depth(SDp, SDp->queue_depth); | ||
2109 | if (change_tag) | ||
2110 | NCR_700_set_tag_neg_state(SDp, NCR_700_START_TAG_NEGOTIATION); | ||
2111 | } | ||
2112 | if (change_tag) | ||
2113 | scsi_target_resume(SDp->sdev_target); | ||
2114 | |||
2115 | return tag_type; | ||
2116 | } | ||
2117 | |||
2118 | static ssize_t | 2083 | static ssize_t |
2119 | NCR_700_show_active_tags(struct device *dev, struct device_attribute *attr, char *buf) | 2084 | NCR_700_show_active_tags(struct device *dev, struct device_attribute *attr, char *buf) |
2120 | { | 2085 | { |