summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/isci/request.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2011-05-08 01:56:57 -0700
committerDan Williams <dan.j.williams@intel.com>2011-07-03 04:04:47 -0700
commit0d84366fbef557f92ef82ac9a224c57ffb3318bc (patch)
tree05f0b1ed0896550ee5182d18ea938338b3a99df2 /drivers/scsi/isci/request.c
parent827a84d4e036b342b31abc2bcc3893505c2c7daa (diff)
isci: make sgl explicit/aligned request object member
Towards unifying request objects we need all members to be defined in the object and not carved out of anonymous buffer space. Signed-off-by: Dan Williams <dan.j.williams@intel.com>
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 e01c2c98f4e..9dd971a3fbb 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(
/* build the common request object. For now,
* we will let the core allocate the IO tag.
*/
- status = scic_io_request_construct(
- &isci_host->sci,
- sci_device,
- SCI_CONTROLLER_INVALID_IO_TAG,
- request,
- request->sci_request_mem_ptr,
- (struct scic_sds_request **)&request->sci_request_handle
- );
+ status = scic_io_request_construct(&isci_host->sci, sci_device,
+ SCI_CONTROLLER_INVALID_IO_TAG,
+ request, request->sci_req,
+ &request->sci_request_handle);
if (status != SCI_SUCCESS) {
dev_warn(&isci_host->pdev->dev,
@@ -277,8 +273,6 @@ static int isci_request_alloc_core(
/* initialize the request object. */
spin_lock_init(&request->state_lock);
- request->sci_request_mem_ptr = ((u8 *)request) +
- sizeof(struct isci_request);
request->request_daddr = handle;
request->isci_host = isci_host;
request->isci_device = isci_device;