diff options
author | Christoph Hellwig <hch@lst.de> | 2014-10-30 06:54:58 -0400 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2014-11-12 05:19:40 -0500 |
commit | 609aa22f3be76d470a334f39cc2197112dc91bd7 (patch) | |
tree | 710daebfe903df387a3b4a9927badde84620bdc9 /include/scsi | |
parent | 125c99bc8b6b108d251169a86324a7ed3c6f3cce (diff) |
scsi: remove ordered_tags scsi_device field
Remove the ordered_tags field, we haven't been issuing ordered tags based
on it since the big barrier rework in 2010.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'include/scsi')
-rw-r--r-- | include/scsi/scsi_device.h | 1 | ||||
-rw-r--r-- | include/scsi/scsi_tcq.h | 9 |
2 files changed, 0 insertions, 10 deletions
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h index 50d47e6e89d1..e8fecb5ea79a 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h | |||
@@ -141,7 +141,6 @@ struct scsi_device { | |||
141 | unsigned ppr:1; /* Device supports PPR messages */ | 141 | unsigned ppr:1; /* Device supports PPR messages */ |
142 | unsigned tagged_supported:1; /* Supports SCSI-II tagged queuing */ | 142 | unsigned tagged_supported:1; /* Supports SCSI-II tagged queuing */ |
143 | unsigned simple_tags:1; /* simple queue tag messages are enabled */ | 143 | unsigned simple_tags:1; /* simple queue tag messages are enabled */ |
144 | unsigned ordered_tags:1;/* ordered queue tag messages are enabled */ | ||
145 | unsigned was_reset:1; /* There was a bus reset on the bus for | 144 | unsigned was_reset:1; /* There was a bus reset on the bus for |
146 | * this device */ | 145 | * this device */ |
147 | unsigned expecting_cc_ua:1; /* Expecting a CHECK_CONDITION/UNIT_ATTN | 146 | unsigned expecting_cc_ua:1; /* Expecting a CHECK_CONDITION/UNIT_ATTN |
diff --git a/include/scsi/scsi_tcq.h b/include/scsi/scsi_tcq.h index 032df74b66d7..342f38c5b065 100644 --- a/include/scsi/scsi_tcq.h +++ b/include/scsi/scsi_tcq.h | |||
@@ -21,17 +21,11 @@ int scsi_change_queue_type(struct scsi_device *sdev, int tag_type); | |||
21 | /** | 21 | /** |
22 | * scsi_get_tag_type - get the type of tag the device supports | 22 | * scsi_get_tag_type - get the type of tag the device supports |
23 | * @sdev: the scsi device | 23 | * @sdev: the scsi device |
24 | * | ||
25 | * Notes: | ||
26 | * If the drive only supports simple tags, returns MSG_SIMPLE_TAG | ||
27 | * if it supports all tag types, returns MSG_ORDERED_TAG. | ||
28 | */ | 24 | */ |
29 | static inline int scsi_get_tag_type(struct scsi_device *sdev) | 25 | static inline int scsi_get_tag_type(struct scsi_device *sdev) |
30 | { | 26 | { |
31 | if (!sdev->tagged_supported) | 27 | if (!sdev->tagged_supported) |
32 | return 0; | 28 | return 0; |
33 | if (sdev->ordered_tags) | ||
34 | return MSG_ORDERED_TAG; | ||
35 | if (sdev->simple_tags) | 29 | if (sdev->simple_tags) |
36 | return MSG_SIMPLE_TAG; | 30 | return MSG_SIMPLE_TAG; |
37 | return 0; | 31 | return 0; |
@@ -41,15 +35,12 @@ static inline void scsi_set_tag_type(struct scsi_device *sdev, int tag) | |||
41 | { | 35 | { |
42 | switch (tag) { | 36 | switch (tag) { |
43 | case MSG_ORDERED_TAG: | 37 | case MSG_ORDERED_TAG: |
44 | sdev->ordered_tags = 1; | ||
45 | /* fall through */ | ||
46 | case MSG_SIMPLE_TAG: | 38 | case MSG_SIMPLE_TAG: |
47 | sdev->simple_tags = 1; | 39 | sdev->simple_tags = 1; |
48 | break; | 40 | break; |
49 | case 0: | 41 | case 0: |
50 | /* fall through */ | 42 | /* fall through */ |
51 | default: | 43 | default: |
52 | sdev->ordered_tags = 0; | ||
53 | sdev->simple_tags = 0; | 44 | sdev->simple_tags = 0; |
54 | break; | 45 | break; |
55 | } | 46 | } |