aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/isci/request.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/isci/request.c')
-rw-r--r--drivers/scsi/isci/request.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c
index e01c2c98f4e9..9dd971a3fbb2 100644
--- a/drivers/scsi/isci/request.c
+++ b/drivers/scsi/isci/request.c
@@ -200,14 +200,10 @@ static enum sci_status isci_io_request_build(
200 /* build the common request object. For now, 200 /* build the common request object. For now,
201 * we will let the core allocate the IO tag. 201 * we will let the core allocate the IO tag.
202 */ 202 */
203 status = scic_io_request_construct( 203 status = scic_io_request_construct(&isci_host->sci, sci_device,
204 &isci_host->sci, 204 SCI_CONTROLLER_INVALID_IO_TAG,
205 sci_device, 205 request, request->sci_req,
206 SCI_CONTROLLER_INVALID_IO_TAG, 206 &request->sci_request_handle);
207 request,
208 request->sci_request_mem_ptr,
209 (struct scic_sds_request **)&request->sci_request_handle
210 );
211 207
212 if (status != SCI_SUCCESS) { 208 if (status != SCI_SUCCESS) {
213 dev_warn(&isci_host->pdev->dev, 209 dev_warn(&isci_host->pdev->dev,
@@ -277,8 +273,6 @@ static int isci_request_alloc_core(
277 273
278 /* initialize the request object. */ 274 /* initialize the request object. */
279 spin_lock_init(&request->state_lock); 275 spin_lock_init(&request->state_lock);
280 request->sci_request_mem_ptr = ((u8 *)request) +
281 sizeof(struct isci_request);
282 request->request_daddr = handle; 276 request->request_daddr = handle;
283 request->isci_host = isci_host; 277 request->isci_host = isci_host;
284 request->isci_device = isci_device; 278 request->isci_device = isci_device;