diff options
| author | Jeff Skirvin <jeffrey.d.skirvin@intel.com> | 2012-03-04 12:44:53 +0000 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2012-05-17 14:33:44 -0700 |
| commit | f8381807ebdfffa34c2c5aa38eda33673d1a7adf (patch) | |
| tree | e91cfb2d072f416fa5c5b72acb267e4945fffe94 /drivers/scsi/isci/request.c | |
| parent | 397497dd61948b0d59d1d21812b93c97b0eeb2dd (diff) | |
| download | linux-f8381807ebdfffa34c2c5aa38eda33673d1a7adf.tar.gz linux-f8381807ebdfffa34c2c5aa38eda33673d1a7adf.tar.bz2 linux-f8381807ebdfffa34c2c5aa38eda33673d1a7adf.zip | |
isci: Remove obviated host callback list.
Since the callbacks to libsas now occur under scic_lock, there is no
longer any reason to save the completed requests in a separate list
for completion to libsas.
Signed-off-by: Jeff Skirvin <jeffrey.d.skirvin@intel.com>
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.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c index 6c530e4275e2..7a0431c73493 100644 --- a/drivers/scsi/isci/request.c +++ b/drivers/scsi/isci/request.c @@ -2748,13 +2748,9 @@ static void isci_request_io_request_complete(struct isci_host *ihost, enum exec_status status = SAS_ABORTED_TASK; dev_dbg(&ihost->pdev->dev, - "%s: request = %p, task = %p,\n" + "%s: request = %p, task = %p, " "task->data_dir = %d completion_status = 0x%x\n", - __func__, - request, - task, - task->data_dir, - completion_status); + __func__, request, task, task->data_dir, completion_status); /* The request is done from an SCU HW perspective. */ @@ -2955,9 +2951,6 @@ static void isci_request_io_request_complete(struct isci_host *ihost, } spin_unlock_irqrestore(&task->task_state_lock, task_flags); - /* Add to the completed list. */ - list_add(&request->completed_node, &ihost->requests_to_complete); - /* complete the io request to the core. */ sci_controller_complete_io(ihost, request->target_device, request); @@ -2966,6 +2959,8 @@ static void isci_request_io_request_complete(struct isci_host *ihost, * task to recognize the already completed case. */ set_bit(IREQ_TERMINATED, &request->flags); + + ireq_done(ihost, request, task); } static void sci_request_started_state_enter(struct sci_base_state_machine *sm) @@ -3416,7 +3411,6 @@ static struct isci_request *isci_request_from_tag(struct isci_host *ihost, u16 t ireq->io_request_completion = NULL; ireq->flags = 0; ireq->num_sg_entries = 0; - INIT_LIST_HEAD(&ireq->completed_node); return ireq; } |