[SCSI] SAS: consolidate linkspeed definitions

At the moment we have two separate linkspeed enumerations covering
roughly the same values.  This patch consolidates on a single one enum
sas_linkspeed in scsi_transport_sas.h and uses it everywhere in the
aic94xx driver.  Eventually I'll get around to removing the duplicated
fields in asd_sas_phy and sas_phy ...

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

3 files changed, 22 insertions, 18 deletions

diff --git a/drivers/scsi/aic94xx/aic94xx_hwi.c b/drivers/scsi/aic94xx/aic94xx_hwi.c
index 075cea85b56b..a24201351108 100644
--- a/drivers/scsi/aic94xx/aic94xx_hwi.c
+++ b/drivers/scsi/aic94xx/aic94xx_hwi.c
@@ -96,7 +96,7 @@ static int asd_init_phy(struct asd_phy *phy)
         sas_phy->type = PHY_TYPE_PHYSICAL;
         sas_phy->role = PHY_ROLE_INITIATOR;
         sas_phy->oob_mode = OOB_NOT_CONNECTED;
-        sas_phy->linkrate = PHY_LINKRATE_NONE;
+        sas_phy->linkrate = SAS_LINK_RATE_UNKNOWN;
 
         phy->id_frm_tok = asd_alloc_coherent(asd_ha,
                                              sizeof(*phy->identify_frame),
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
index 69aa70887530..302b54fddf3c 100644
--- a/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
@@ -240,10 +240,14 @@ static int __devinit asd_common_setup(struct asd_ha_struct *asd_ha)
         /* All phys are enabled, by default. */
         asd_ha->hw_prof.enabled_phys = 0xFF;
         for (i = 0; i < ASD_MAX_PHYS; i++) {
-                asd_ha->hw_prof.phy_desc[i].max_sas_lrate = PHY_LINKRATE_3;
-                asd_ha->hw_prof.phy_desc[i].min_sas_lrate = PHY_LINKRATE_1_5;
-                asd_ha->hw_prof.phy_desc[i].max_sata_lrate= PHY_LINKRATE_1_5;
-                asd_ha->hw_prof.phy_desc[i].min_sata_lrate= PHY_LINKRATE_1_5;
+                asd_ha->hw_prof.phy_desc[i].max_sas_lrate =
+                        SAS_LINK_RATE_3_0_GBPS;
+                asd_ha->hw_prof.phy_desc[i].min_sas_lrate =
+                        SAS_LINK_RATE_1_5_GBPS;
+                asd_ha->hw_prof.phy_desc[i].max_sata_lrate =
+                        SAS_LINK_RATE_1_5_GBPS;
+                asd_ha->hw_prof.phy_desc[i].min_sata_lrate =
+                        SAS_LINK_RATE_1_5_GBPS;
         }
 
         return 0;
diff --git a/drivers/scsi/aic94xx/aic94xx_scb.c b/drivers/scsi/aic94xx/aic94xx_scb.c
index fc1b7438a913..ef8ca08b545f 100644
--- a/drivers/scsi/aic94xx/aic94xx_scb.c
+++ b/drivers/scsi/aic94xx/aic94xx_scb.c
@@ -55,15 +55,15 @@ static inline void get_lrate_mode(struct asd_phy *phy, u8 oob_mode)
         switch (oob_mode & 7) {
         case PHY_SPEED_60:
                 /* FIXME: sas transport class doesn't have this */
-                phy->sas_phy.linkrate = PHY_LINKRATE_6;
+                phy->sas_phy.linkrate = SAS_LINK_RATE_6_0_GBPS;
                 phy->sas_phy.phy->negotiated_linkrate = SAS_LINK_RATE_6_0_GBPS;
                 break;
         case PHY_SPEED_30:
-                phy->sas_phy.linkrate = PHY_LINKRATE_3;
+                phy->sas_phy.linkrate = SAS_LINK_RATE_3_0_GBPS;
                 phy->sas_phy.phy->negotiated_linkrate = SAS_LINK_RATE_3_0_GBPS;
                 break;
         case PHY_SPEED_15:
-                phy->sas_phy.linkrate = PHY_LINKRATE_1_5;
+                phy->sas_phy.linkrate = SAS_LINK_RATE_1_5_GBPS;
                 phy->sas_phy.phy->negotiated_linkrate = SAS_LINK_RATE_1_5_GBPS;
                 break;
         }
@@ -540,39 +540,39 @@ static inline void set_speed_mask(u8 *speed_mask, struct asd_phy_desc *pd)
                 | SATA_SPEED_30_DIS | SATA_SPEED_15_DIS;
 
         switch (pd->max_sas_lrate) {
-        case PHY_LINKRATE_6:
+        case SAS_LINK_RATE_6_0_GBPS:
                 *speed_mask &= ~SAS_SPEED_60_DIS;
         default:
-        case PHY_LINKRATE_3:
+        case SAS_LINK_RATE_3_0_GBPS:
                 *speed_mask &= ~SAS_SPEED_30_DIS;
-        case PHY_LINKRATE_1_5:
+        case SAS_LINK_RATE_1_5_GBPS:
                 *speed_mask &= ~SAS_SPEED_15_DIS;
         }
 
         switch (pd->min_sas_lrate) {
-        case PHY_LINKRATE_6:
+        case SAS_LINK_RATE_6_0_GBPS:
                 *speed_mask |= SAS_SPEED_30_DIS;
-        case PHY_LINKRATE_3:
+        case SAS_LINK_RATE_3_0_GBPS:
                 *speed_mask |= SAS_SPEED_15_DIS;
         default:
-        case PHY_LINKRATE_1_5:
+        case SAS_LINK_RATE_1_5_GBPS:
                 /* nothing to do */
                 ;
         }
 
         switch (pd->max_sata_lrate) {
-        case PHY_LINKRATE_3:
+        case SAS_LINK_RATE_3_0_GBPS:
                 *speed_mask &= ~SATA_SPEED_30_DIS;
         default:
-        case PHY_LINKRATE_1_5:
+        case SAS_LINK_RATE_1_5_GBPS:
                 *speed_mask &= ~SATA_SPEED_15_DIS;
         }
 
         switch (pd->min_sata_lrate) {
-        case PHY_LINKRATE_3:
+        case SAS_LINK_RATE_3_0_GBPS:
                 *speed_mask |= SATA_SPEED_15_DIS;
         default:
-        case PHY_LINKRATE_1_5:
+        case SAS_LINK_RATE_1_5_GBPS:
                 /* nothing to do */
                 ;
         }