summaryrefslogtreecommitdiff
path: root/drivers/scsi/isci/phy.h
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2012-02-01 00:44:14 -0800
committerDan Williams <dan.j.williams@intel.com>2012-05-17 12:27:11 -0700
commitc79dd80d73017a88a2c2ae46e7d5303cba6a32e0 (patch)
tree4bf1f09df72921272e38bc0c9610374d4c1873e2 /drivers/scsi/isci/phy.h
parent11cc51835af0e6fbb2da9cb012bdaaa036497b7f (diff)
downloadlinux-3.10-c79dd80d73017a88a2c2ae46e7d5303cba6a32e0.tar.gz
linux-3.10-c79dd80d73017a88a2c2ae46e7d5303cba6a32e0.tar.bz2
linux-3.10-c79dd80d73017a88a2c2ae46e7d5303cba6a32e0.zip
isci: kill sci_phy_protocol and sci_request_protocol
Holdovers from the initial driver cleanup, replace with enum sas_protocol. Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/phy.h')
-rw-r--r--drivers/scsi/isci/phy.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/scsi/isci/phy.h b/drivers/scsi/isci/phy.h
index 0e45833ba06..45fecfa36a9 100644
--- a/drivers/scsi/isci/phy.h
+++ b/drivers/scsi/isci/phy.h
@@ -76,13 +76,6 @@
*/
#define SCIC_SDS_SATA_LINK_TRAINING_TIMEOUT 250
-enum sci_phy_protocol {
- SCIC_SDS_PHY_PROTOCOL_UNKNOWN,
- SCIC_SDS_PHY_PROTOCOL_SAS,
- SCIC_SDS_PHY_PROTOCOL_SATA,
- SCIC_SDS_MAX_PHY_PROTOCOLS
-};
-
/**
* isci_phy - hba local phy infrastructure
* @sm:
@@ -95,7 +88,7 @@ struct isci_phy {
struct sci_base_state_machine sm;
struct isci_port *owning_port;
enum sas_linkrate max_negotiated_speed;
- enum sci_phy_protocol protocol;
+ enum sas_protocol protocol;
u8 phy_index;
bool bcn_received_while_port_unassigned;
bool is_in_link_training;