On 11/24/2014 03:36 PM, Christoph Hellwig wrote:
> There is no benefit over just setting sdev->simple_tags directly.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> drivers/scsi/53c700.c | 2 +-
> drivers/scsi/tmscsim.c | 2 +-
> include/scsi/scsi_tcq.h | 15 ---------------
> 3 files changed, 2 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c
> index 2c87a7a..82abfce 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/drivers/scsi/tmscsim.c b/drivers/scsi/tmscsim.c
> index 6c3c2ce..14ccc9a 100644
> --- a/drivers/scsi/tmscsim.c
> +++ b/drivers/scsi/tmscsim.c
> @@ -2190,7 +2190,7 @@ static int dc390_slave_configure(struct scsi_device *sdev)
> * XXX: Note that while this driver used to called scsi_activate_tcq,
> * it never actually set a tag type, so emulate the old behavior.
> */
> - scsi_set_tag_type(sdev, 0);
> + sdev->simple_tags = 0;
>
> if (sdev->tagged_supported && (dcb->DevMode & TAG_QUEUEING_)) {
> dcb->SyncMode |= EN_TAG_QUEUEING;
> diff --git a/include/scsi/scsi_tcq.h b/include/scsi/scsi_tcq.h
> index 681e010..e624aca 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)
> {
>
Probably needs to be adjusted now that's tmscsim is gone, but
nevertheless:
Reviewed-by: Hannes Reinecke <hare@xxxxxxx>
Cheers,
Hannes
--
Dr. Hannes Reinecke zSeries & Storage
hare@xxxxxxx +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 21284 (AG Nürnberg)
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
