diff options
author | Jeff Skirvin <jeffrey.d.skirvin@intel.com> | 2011-10-27 18:05:22 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2011-10-31 05:19:47 -0400 |
commit | 3b34c169f8197e02529fa3ec703703c2ce418c57 (patch) | |
tree | 4834c97238ea0b7968de0bd9b7efd8c780175eda /drivers/scsi/isci/request.h | |
parent | 98145cb722b51ccc3ba27166c9803545accba950 (diff) |
[SCSI] isci: Remove redundant isci_request.ttype field.
Use the existing IREQ_TMF flag as a request type indicator.
Signed-off-by: Jeff Skirvin <jeffrey.d.skirvin@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/isci/request.h')
-rw-r--r-- | drivers/scsi/isci/request.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/scsi/isci/request.h b/drivers/scsi/isci/request.h index f720b97b7bb5..be38933dd6df 100644 --- a/drivers/scsi/isci/request.h +++ b/drivers/scsi/isci/request.h | |||
@@ -77,11 +77,6 @@ enum isci_request_status { | |||
77 | dead = 0x07 | 77 | dead = 0x07 |
78 | }; | 78 | }; |
79 | 79 | ||
80 | enum task_type { | ||
81 | io_task = 0, | ||
82 | tmf_task = 1 | ||
83 | }; | ||
84 | |||
85 | enum sci_request_protocol { | 80 | enum sci_request_protocol { |
86 | SCIC_NO_PROTOCOL, | 81 | SCIC_NO_PROTOCOL, |
87 | SCIC_SMP_PROTOCOL, | 82 | SCIC_SMP_PROTOCOL, |
@@ -116,7 +111,6 @@ struct isci_request { | |||
116 | #define IREQ_ACTIVE 3 | 111 | #define IREQ_ACTIVE 3 |
117 | unsigned long flags; | 112 | unsigned long flags; |
118 | /* XXX kill ttype and ttype_ptr, allocate full sas_task */ | 113 | /* XXX kill ttype and ttype_ptr, allocate full sas_task */ |
119 | enum task_type ttype; | ||
120 | union ttype_ptr_union { | 114 | union ttype_ptr_union { |
121 | struct sas_task *io_task_ptr; /* When ttype==io_task */ | 115 | struct sas_task *io_task_ptr; /* When ttype==io_task */ |
122 | struct isci_tmf *tmf_task_ptr; /* When ttype==tmf_task */ | 116 | struct isci_tmf *tmf_task_ptr; /* When ttype==tmf_task */ |