diff options
| author | Darrick J. Wong <djwong@us.ibm.com> | 2007-11-05 14:51:17 -0500 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-01-11 19:22:41 -0500 |
| commit | 5929faf3334f4c69f3bb02be59d7c127e0cefa1f (patch) | |
| tree | d82d79f1e2aaea1306e6e4888590a6755c99d7d7 /include/scsi/sas.h | |
| parent | e5a69e27cc193f98c9a5a9086e3bf85528170623 (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/sas.h')
| -rw-r--r-- | include/scsi/sas.h | 13 |
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 { | |||
| 102 | SATA_PM_PORT= 8, | 102 | SATA_PM_PORT= 8, |
| 103 | }; | 103 | }; |
| 104 | 104 | ||
| 105 | /* Partly from IDENTIFY address frame. */ | 105 | enum sas_protocol { |
| 106 | enum 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 */ |