aboutsummaryrefslogtreecommitdiffstats
path: root/include/scsi
diff options
context:
space:
mode:
authorDarrick J. Wong <djwong@us.ibm.com>2007-11-05 14:51:17 -0500
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-01-11 19:22:41 -0500
commit5929faf3334f4c69f3bb02be59d7c127e0cefa1f (patch)
treed82d79f1e2aaea1306e6e4888590a6755c99d7d7 /include/scsi
parente5a69e27cc193f98c9a5a9086e3bf85528170623 (diff)
[SCSI] libsas: Convert sas_proto users to sas_protocol
sparse complains about the mixing of enums in libsas. Since the underlying numeric values of both enums are the same, combine them to get rid of the warning. Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'include/scsi')
-rw-r--r--include/scsi/libsas.h18
-rw-r--r--include/scsi/sas.h13
-rw-r--r--include/scsi/scsi_transport_sas.h8
3 files changed, 16 insertions, 23 deletions
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index a466c2cb8955..e42374cebf95 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -122,8 +122,8 @@ struct ex_phy {
122 u8 attached_sata_dev:1; 122 u8 attached_sata_dev:1;
123 u8 attached_sata_ps:1; 123 u8 attached_sata_ps:1;
124 124
125 enum sas_proto attached_tproto; 125 enum sas_protocol attached_tproto;
126 enum sas_proto attached_iproto; 126 enum sas_protocol attached_iproto;
127 127
128 u8 attached_sas_addr[SAS_ADDR_SIZE]; 128 u8 attached_sas_addr[SAS_ADDR_SIZE];
129 u8 attached_phy_id; 129 u8 attached_phy_id;
@@ -191,8 +191,8 @@ struct domain_device {
191 191
192 struct list_head dev_list_node; 192 struct list_head dev_list_node;
193 193
194 enum sas_proto iproto; 194 enum sas_protocol iproto;
195 enum sas_proto tproto; 195 enum sas_protocol tproto;
196 196
197 struct sas_rphy *rphy; 197 struct sas_rphy *rphy;
198 198
@@ -245,8 +245,8 @@ struct asd_sas_port {
245 enum sas_class class; 245 enum sas_class class;
246 u8 sas_addr[SAS_ADDR_SIZE]; 246 u8 sas_addr[SAS_ADDR_SIZE];
247 u8 attached_sas_addr[SAS_ADDR_SIZE]; 247 u8 attached_sas_addr[SAS_ADDR_SIZE];
248 enum sas_proto iproto; 248 enum sas_protocol iproto;
249 enum sas_proto tproto; 249 enum sas_protocol tproto;
250 250
251 enum sas_oob_mode oob_mode; 251 enum sas_oob_mode oob_mode;
252 252
@@ -289,8 +289,8 @@ struct asd_sas_phy {
289 289
290 int id; /* must be set */ 290 int id; /* must be set */
291 enum sas_class class; 291 enum sas_class class;
292 enum sas_proto iproto; 292 enum sas_protocol iproto;
293 enum sas_proto tproto; 293 enum sas_protocol tproto;
294 294
295 enum sas_phy_type type; 295 enum sas_phy_type type;
296 enum sas_phy_role role; 296 enum sas_phy_role role;
@@ -537,7 +537,7 @@ struct sas_task {
537 spinlock_t task_state_lock; 537 spinlock_t task_state_lock;
538 unsigned task_state_flags; 538 unsigned task_state_flags;
539 539
540 enum sas_proto task_proto; 540 enum sas_protocol task_proto;
541 541
542 /* Used by the discovery code. */ 542 /* Used by the discovery code. */
543 struct timer_list timer; 543 struct timer_list timer;
diff --git a/include/scsi/sas.h b/include/scsi/sas.h
index 2f4b6afa34fc..e9fd02281381 100644
--- a/include/scsi/sas.h
+++ b/include/scsi/sas.h
@@ -102,13 +102,12 @@ enum sas_dev_type {
102 SATA_PM_PORT= 8, 102 SATA_PM_PORT= 8,
103}; 103};
104 104
105/* Partly from IDENTIFY address frame. */ 105enum sas_protocol {
106enum sas_proto { 106 SAS_PROTOCOL_SATA = 0x01,
107 SATA_PROTO = 1, 107 SAS_PROTOCOL_SMP = 0x02,
108 SAS_PROTO_SMP = 2, /* protocol */ 108 SAS_PROTOCOL_STP = 0x04,
109 SAS_PROTO_STP = 4, /* protocol */ 109 SAS_PROTOCOL_SSP = 0x08,
110 SAS_PROTO_SSP = 8, /* protocol */ 110 SAS_PROTOCOL_ALL = 0x0E,
111 SAS_PROTO_ALL = 0xE,
112}; 111};
113 112
114/* From the spec; local phys only */ 113/* From the spec; local phys only */
diff --git a/include/scsi/scsi_transport_sas.h b/include/scsi/scsi_transport_sas.h
index abdfd2e27dd7..007d92904207 100644
--- a/include/scsi/scsi_transport_sas.h
+++ b/include/scsi/scsi_transport_sas.h
@@ -4,6 +4,7 @@
4#include <linux/transport_class.h> 4#include <linux/transport_class.h>
5#include <linux/types.h> 5#include <linux/types.h>
6#include <linux/mutex.h> 6#include <linux/mutex.h>
7#include <scsi/sas.h>
7 8
8struct scsi_transport_template; 9struct scsi_transport_template;
9struct sas_rphy; 10struct sas_rphy;
@@ -16,13 +17,6 @@ enum sas_device_type {
16 SAS_FANOUT_EXPANDER_DEVICE, 17 SAS_FANOUT_EXPANDER_DEVICE,
17}; 18};
18 19
19enum sas_protocol {
20 SAS_PROTOCOL_SATA = 0x01,
21 SAS_PROTOCOL_SMP = 0x02,
22 SAS_PROTOCOL_STP = 0x04,
23 SAS_PROTOCOL_SSP = 0x08,
24};
25
26static inline int sas_protocol_ata(enum sas_protocol proto) 20static inline int sas_protocol_ata(enum sas_protocol proto)
27{ 21{
28 return ((proto & SAS_PROTOCOL_SATA) || 22 return ((proto & SAS_PROTOCOL_SATA) ||