summaryrefslogtreecommitdiff
path: root/include/scsi/sas.h
diff options
context:
space:
mode:
authorDarrick J. Wong <djwong@us.ibm.com>2007-11-05 22:51:17 +0300
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-01-12 03:22:41 +0300
commit5929faf3334f4c69f3bb02be59d7c127e0cefa1f (patch)
treed82d79f1e2aaea1306e6e4888590a6755c99d7d7 /include/scsi/sas.h
parente5a69e27cc193f98c9a5a9086e3bf85528170623 (diff)
downloadlinux-5929faf3334f4c69f3bb02be59d7c127e0cefa1f.tar.xz
[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/sas.h')
-rw-r--r--include/scsi/sas.h13
1 files changed, 6 insertions, 7 deletions
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 {
SATA_PM_PORT= 8,
};
-/* Partly from IDENTIFY address frame. */
-enum sas_proto {
- SATA_PROTO = 1,
- SAS_PROTO_SMP = 2, /* protocol */
- SAS_PROTO_STP = 4, /* protocol */
- SAS_PROTO_SSP = 8, /* protocol */
- SAS_PROTO_ALL = 0xE,
+enum sas_protocol {
+ SAS_PROTOCOL_SATA = 0x01,
+ SAS_PROTOCOL_SMP = 0x02,
+ SAS_PROTOCOL_STP = 0x04,
+ SAS_PROTOCOL_SSP = 0x08,
+ SAS_PROTOCOL_ALL = 0x0E,
};
/* From the spec; local phys only */