aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/libsas/sas_expander.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/libsas/sas_expander.c')
-rw-r--r--drivers/scsi/libsas/sas_expander.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index 8727436b222d..27674fe468f5 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -656,9 +656,9 @@ static struct domain_device *sas_ex_discover_end_dev(
656 sas_ex_get_linkrate(parent, child, phy); 656 sas_ex_get_linkrate(parent, child, phy);
657 657
658#ifdef CONFIG_SCSI_SAS_ATA 658#ifdef CONFIG_SCSI_SAS_ATA
659 if ((phy->attached_tproto & SAS_PROTO_STP) || phy->attached_sata_dev) { 659 if ((phy->attached_tproto & SAS_PROTOCOL_STP) || phy->attached_sata_dev) {
660 child->dev_type = SATA_DEV; 660 child->dev_type = SATA_DEV;
661 if (phy->attached_tproto & SAS_PROTO_STP) 661 if (phy->attached_tproto & SAS_PROTOCOL_STP)
662 child->tproto = phy->attached_tproto; 662 child->tproto = phy->attached_tproto;
663 if (phy->attached_sata_dev) 663 if (phy->attached_sata_dev)
664 child->tproto |= SATA_DEV; 664 child->tproto |= SATA_DEV;
@@ -695,7 +695,7 @@ static struct domain_device *sas_ex_discover_end_dev(
695 } 695 }
696 } else 696 } else
697#endif 697#endif
698 if (phy->attached_tproto & SAS_PROTO_SSP) { 698 if (phy->attached_tproto & SAS_PROTOCOL_SSP) {
699 child->dev_type = SAS_END_DEV; 699 child->dev_type = SAS_END_DEV;
700 rphy = sas_end_device_alloc(phy->port); 700 rphy = sas_end_device_alloc(phy->port);
701 /* FIXME: error handling */ 701 /* FIXME: error handling */