[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>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/scsi/aic94xx/aic94xx_scb.c b/drivers/scsi/aic94xx/aic94xx_scb.c
index db6ab1a3b81e..0febad4dd75f 100644
--- a/drivers/scsi/aic94xx/aic94xx_scb.c
+++ b/drivers/scsi/aic94xx/aic94xx_scb.c
@@ -788,12 +788,12 @@ void asd_build_control_phy(struct asd_ascb *ascb, int phy_id, u8 subfunc)
 
                 /* initiator port settings are in the hi nibble */
                 if (phy->sas_phy.role == PHY_ROLE_INITIATOR)
-                        control_phy->port_type = SAS_PROTO_ALL << 4;
+                        control_phy->port_type = SAS_PROTOCOL_ALL << 4;
                 else if (phy->sas_phy.role == PHY_ROLE_TARGET)
-                        control_phy->port_type = SAS_PROTO_ALL;
+                        control_phy->port_type = SAS_PROTOCOL_ALL;
                 else
                         control_phy->port_type =
-                                (SAS_PROTO_ALL << 4) | SAS_PROTO_ALL;
+                                (SAS_PROTOCOL_ALL << 4) | SAS_PROTOCOL_ALL;
 
                 /* link reset retries, this should be nominal */
                 control_phy->link_reset_retries = 10;