[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, 7 insertions, 7 deletions

diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 72acdabe7f80..8d91313dd888 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -114,7 +114,7 @@ struct ex_phy {
         enum ex_phy_state phy_state;
 
         enum sas_dev_type attached_dev_type;
-        enum sas_phy_linkrate linkrate;
+        enum sas_linkrate linkrate;
 
         u8   attached_sata_host:1;
         u8   attached_sata_dev:1;
@@ -170,9 +170,9 @@ struct sata_device {
 struct domain_device {
         enum sas_dev_type dev_type;
 
-        enum sas_phy_linkrate linkrate;
-        enum sas_phy_linkrate min_linkrate;
-        enum sas_phy_linkrate max_linkrate;
+        enum sas_linkrate linkrate;
+        enum sas_linkrate min_linkrate;
+        enum sas_linkrate max_linkrate;
 
         int  pathways;
 
@@ -220,7 +220,7 @@ struct asd_sas_port {
         struct domain_device *port_dev;
         spinlock_t dev_list_lock;
         struct list_head dev_list;
-        enum   sas_phy_linkrate linkrate;
+        enum   sas_linkrate linkrate;
 
         struct sas_phy *phy;
         struct work_struct work;
@@ -276,7 +276,7 @@ struct asd_sas_phy {
         enum sas_phy_type  type;
         enum sas_phy_role  role;
         enum sas_oob_mode  oob_mode;
-        enum sas_phy_linkrate linkrate;
+        enum sas_linkrate linkrate;
 
         u8   *sas_addr;           /* must be set */
         u8   attached_sas_addr[SAS_ADDR_SIZE]; /* class:RO, driver: R/W */
@@ -368,7 +368,7 @@ void sas_hash_addr(u8 *hashed, const u8 *sas_addr);
 static inline void sas_phy_disconnected(struct asd_sas_phy *phy)
 {
         phy->oob_mode = OOB_NOT_CONNECTED;
-        phy->linkrate = PHY_LINKRATE_NONE;
+        phy->linkrate = SAS_LINK_RATE_UNKNOWN;
 }
 
 /* ---------- Tasks ---------- */