diff options
Diffstat (limited to 'drivers/scsi/isci/remote_node_context.c')
-rw-r--r-- | drivers/scsi/isci/remote_node_context.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/scsi/isci/remote_node_context.c b/drivers/scsi/isci/remote_node_context.c index e485744e1263..8a5203b6eb09 100644 --- a/drivers/scsi/isci/remote_node_context.c +++ b/drivers/scsi/isci/remote_node_context.c | |||
@@ -107,11 +107,11 @@ static void scic_sds_remote_node_context_construct_buffer( | |||
107 | struct domain_device *dev = idev->domain_dev; | 107 | struct domain_device *dev = idev->domain_dev; |
108 | int rni = sci_rnc->remote_node_index; | 108 | int rni = sci_rnc->remote_node_index; |
109 | union scu_remote_node_context *rnc; | 109 | union scu_remote_node_context *rnc; |
110 | struct scic_sds_controller *scic; | 110 | struct isci_host *ihost; |
111 | __le64 sas_addr; | 111 | __le64 sas_addr; |
112 | 112 | ||
113 | scic = scic_sds_remote_device_get_controller(idev); | 113 | ihost = scic_sds_remote_device_get_controller(idev); |
114 | rnc = scic_sds_controller_get_remote_node_context_buffer(scic, rni); | 114 | rnc = scic_sds_controller_get_remote_node_context_buffer(ihost, rni); |
115 | 115 | ||
116 | memset(rnc, 0, sizeof(union scu_remote_node_context) | 116 | memset(rnc, 0, sizeof(union scu_remote_node_context) |
117 | * scic_sds_remote_device_node_count(idev)); | 117 | * scic_sds_remote_device_node_count(idev)); |
@@ -135,14 +135,14 @@ static void scic_sds_remote_node_context_construct_buffer( | |||
135 | 135 | ||
136 | if (dev->dev_type == SATA_DEV || (dev->tproto & SAS_PROTOCOL_STP)) { | 136 | if (dev->dev_type == SATA_DEV || (dev->tproto & SAS_PROTOCOL_STP)) { |
137 | rnc->ssp.connection_occupancy_timeout = | 137 | rnc->ssp.connection_occupancy_timeout = |
138 | scic->user_parameters.sds1.stp_max_occupancy_timeout; | 138 | ihost->user_parameters.sds1.stp_max_occupancy_timeout; |
139 | rnc->ssp.connection_inactivity_timeout = | 139 | rnc->ssp.connection_inactivity_timeout = |
140 | scic->user_parameters.sds1.stp_inactivity_timeout; | 140 | ihost->user_parameters.sds1.stp_inactivity_timeout; |
141 | } else { | 141 | } else { |
142 | rnc->ssp.connection_occupancy_timeout = | 142 | rnc->ssp.connection_occupancy_timeout = |
143 | scic->user_parameters.sds1.ssp_max_occupancy_timeout; | 143 | ihost->user_parameters.sds1.ssp_max_occupancy_timeout; |
144 | rnc->ssp.connection_inactivity_timeout = | 144 | rnc->ssp.connection_inactivity_timeout = |
145 | scic->user_parameters.sds1.ssp_inactivity_timeout; | 145 | ihost->user_parameters.sds1.ssp_inactivity_timeout; |
146 | } | 146 | } |
147 | 147 | ||
148 | rnc->ssp.initial_arbitration_wait_time = 0; | 148 | rnc->ssp.initial_arbitration_wait_time = 0; |