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

1 files changed, 8 insertions, 4 deletions

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;