aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/aic94xx/aic94xx_scb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/aic94xx/aic94xx_scb.c')
-rw-r--r--drivers/scsi/aic94xx/aic94xx_scb.c26
1 files changed, 13 insertions, 13 deletions
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)
55 switch (oob_mode & 7) { 55 switch (oob_mode & 7) {
56 case PHY_SPEED_60: 56 case PHY_SPEED_60:
57 /* FIXME: sas transport class doesn't have this */ 57 /* FIXME: sas transport class doesn't have this */
58 phy->sas_phy.linkrate = PHY_LINKRATE_6; 58 phy->sas_phy.linkrate = SAS_LINK_RATE_6_0_GBPS;
59 phy->sas_phy.phy->negotiated_linkrate = SAS_LINK_RATE_6_0_GBPS; 59 phy->sas_phy.phy->negotiated_linkrate = SAS_LINK_RATE_6_0_GBPS;
60 break; 60 break;
61 case PHY_SPEED_30: 61 case PHY_SPEED_30:
62 phy->sas_phy.linkrate = PHY_LINKRATE_3; 62 phy->sas_phy.linkrate = SAS_LINK_RATE_3_0_GBPS;
63 phy->sas_phy.phy->negotiated_linkrate = SAS_LINK_RATE_3_0_GBPS; 63 phy->sas_phy.phy->negotiated_linkrate = SAS_LINK_RATE_3_0_GBPS;
64 break; 64 break;
65 case PHY_SPEED_15: 65 case PHY_SPEED_15:
66 phy->sas_phy.linkrate = PHY_LINKRATE_1_5; 66 phy->sas_phy.linkrate = SAS_LINK_RATE_1_5_GBPS;
67 phy->sas_phy.phy->negotiated_linkrate = SAS_LINK_RATE_1_5_GBPS; 67 phy->sas_phy.phy->negotiated_linkrate = SAS_LINK_RATE_1_5_GBPS;
68 break; 68 break;
69 } 69 }
@@ -540,39 +540,39 @@ static inline void set_speed_mask(u8 *speed_mask, struct asd_phy_desc *pd)
540 | SATA_SPEED_30_DIS | SATA_SPEED_15_DIS; 540 | SATA_SPEED_30_DIS | SATA_SPEED_15_DIS;
541 541
542 switch (pd->max_sas_lrate) { 542 switch (pd->max_sas_lrate) {
543 case PHY_LINKRATE_6: 543 case SAS_LINK_RATE_6_0_GBPS:
544 *speed_mask &= ~SAS_SPEED_60_DIS; 544 *speed_mask &= ~SAS_SPEED_60_DIS;
545 default: 545 default:
546 case PHY_LINKRATE_3: 546 case SAS_LINK_RATE_3_0_GBPS:
547 *speed_mask &= ~SAS_SPEED_30_DIS; 547 *speed_mask &= ~SAS_SPEED_30_DIS;
548 case PHY_LINKRATE_1_5: 548 case SAS_LINK_RATE_1_5_GBPS:
549 *speed_mask &= ~SAS_SPEED_15_DIS; 549 *speed_mask &= ~SAS_SPEED_15_DIS;
550 } 550 }
551 551
552 switch (pd->min_sas_lrate) { 552 switch (pd->min_sas_lrate) {
553 case PHY_LINKRATE_6: 553 case SAS_LINK_RATE_6_0_GBPS:
554 *speed_mask |= SAS_SPEED_30_DIS; 554 *speed_mask |= SAS_SPEED_30_DIS;
555 case PHY_LINKRATE_3: 555 case SAS_LINK_RATE_3_0_GBPS:
556 *speed_mask |= SAS_SPEED_15_DIS; 556 *speed_mask |= SAS_SPEED_15_DIS;
557 default: 557 default:
558 case PHY_LINKRATE_1_5: 558 case SAS_LINK_RATE_1_5_GBPS:
559 /* nothing to do */ 559 /* nothing to do */
560 ; 560 ;
561 } 561 }
562 562
563 switch (pd->max_sata_lrate) { 563 switch (pd->max_sata_lrate) {
564 case PHY_LINKRATE_3: 564 case SAS_LINK_RATE_3_0_GBPS:
565 *speed_mask &= ~SATA_SPEED_30_DIS; 565 *speed_mask &= ~SATA_SPEED_30_DIS;
566 default: 566 default:
567 case PHY_LINKRATE_1_5: 567 case SAS_LINK_RATE_1_5_GBPS:
568 *speed_mask &= ~SATA_SPEED_15_DIS; 568 *speed_mask &= ~SATA_SPEED_15_DIS;
569 } 569 }
570 570
571 switch (pd->min_sata_lrate) { 571 switch (pd->min_sata_lrate) {
572 case PHY_LINKRATE_3: 572 case SAS_LINK_RATE_3_0_GBPS:
573 *speed_mask |= SATA_SPEED_15_DIS; 573 *speed_mask |= SATA_SPEED_15_DIS;
574 default: 574 default:
575 case PHY_LINKRATE_1_5: 575 case SAS_LINK_RATE_1_5_GBPS:
576 /* nothing to do */ 576 /* nothing to do */
577 ; 577 ;
578 } 578 }