diff options
author | Christoph Hellwig <hch@infradead.org> | 2014-11-24 15:07:25 (GMT) |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2014-12-04 08:58:33 (GMT) |
commit | 68d81f40047cc4f99e86807e1160fb07a7b856c7 (patch) | |
tree | a1d260df122f4dd9c2830832e4b09b6075ee1323 /include | |
parent | 4e484896ac8b1877097770bc630802d5535e8d46 (diff) | |
download | linux-68d81f40047cc4f99e86807e1160fb07a7b856c7.tar.xz |
scsi: remove MSG_*_TAG defines
For SPI drivers use the message definitions from scsi.h, and for target
drivers introduce a new TCM_*_TAG namespace.
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
Diffstat (limited to 'include')
-rw-r--r-- | include/scsi/scsi_tcq.h | 5 | ||||
-rw-r--r-- | include/target/target_core_base.h | 6 | ||||
-rw-r--r-- | include/trace/events/target.h | 8 |
3 files changed, 10 insertions, 9 deletions
diff --git a/include/scsi/scsi_tcq.h b/include/scsi/scsi_tcq.h index e624aca..9708b28 100644 --- a/include/scsi/scsi_tcq.h +++ b/include/scsi/scsi_tcq.h @@ -6,11 +6,6 @@ #include <scsi/scsi_device.h> #include <scsi/scsi_host.h> -#define MSG_SIMPLE_TAG 0x20 -#define MSG_HEAD_TAG 0x21 -#define MSG_ORDERED_TAG 0x22 -#define MSG_ACA_TAG 0x24 /* unsupported */ - #define SCSI_NO_TAG (-1) /* identify no tag in use */ diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h index 23c518a..397fb63 100644 --- a/include/target/target_core_base.h +++ b/include/target/target_core_base.h @@ -476,6 +476,12 @@ struct se_dif_v1_tuple { __be32 ref_tag; }; +/* for sam_task_attr */ +#define TCM_SIMPLE_TAG 0x20 +#define TCM_HEAD_TAG 0x21 +#define TCM_ORDERED_TAG 0x22 +#define TCM_ACA_TAG 0x24 + struct se_cmd { /* SAM response code being sent to initiator */ u8 scsi_status; diff --git a/include/trace/events/target.h b/include/trace/events/target.h index da9cc0f..a456680 100644 --- a/include/trace/events/target.h +++ b/include/trace/events/target.h @@ -109,10 +109,10 @@ #define show_task_attribute_name(val) \ __print_symbolic(val, \ - { MSG_SIMPLE_TAG, "SIMPLE" }, \ - { MSG_HEAD_TAG, "HEAD" }, \ - { MSG_ORDERED_TAG, "ORDERED" }, \ - { MSG_ACA_TAG, "ACA" } ) + { TCM_SIMPLE_TAG, "SIMPLE" }, \ + { TCM_HEAD_TAG, "HEAD" }, \ + { TCM_ORDERED_TAG, "ORDERED" }, \ + { TCM_ACA_TAG, "ACA" } ) #define show_scsi_status_name(val) \ __print_symbolic(val, \ |