aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/isci/task.c
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2011-07-03 15:14:45 -0400
committerJames Bottomley <JBottomley@Parallels.com>2011-07-03 15:26:24 -0400
commita5ec7f86dc5432c44d8407a144e7617ec65da770 (patch)
tree9fdbe6b2d5784a68bb350d69eb83ae0e3cb45c90 /drivers/scsi/isci/task.c
parent5b45b69c0573b802a50ccad30e154b93d3b36ff8 (diff)
[SCSI] isci: fix checkpatch errors
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/isci/task.c')
-rw-r--r--drivers/scsi/isci/task.c71
1 files changed, 36 insertions, 35 deletions
diff --git a/drivers/scsi/isci/task.c b/drivers/scsi/isci/task.c
index 2df45c57fc60..d6bcdd013dc9 100644
--- a/drivers/scsi/isci/task.c
+++ b/drivers/scsi/isci/task.c
@@ -88,44 +88,45 @@ static void isci_task_refuse(struct isci_host *ihost, struct sas_task *task,
88 * function should not be completed to the host in the regular path. 88 * function should not be completed to the host in the regular path.
89 */ 89 */
90 switch (disposition) { 90 switch (disposition) {
91 case isci_perform_normal_io_completion: 91 case isci_perform_normal_io_completion:
92 /* Normal notification (task_done) */ 92 /* Normal notification (task_done) */
93 dev_dbg(&ihost->pdev->dev, 93 dev_dbg(&ihost->pdev->dev,
94 "%s: Normal - task = %p, response=%d, " 94 "%s: Normal - task = %p, response=%d, "
95 "status=%d\n", 95 "status=%d\n",
96 __func__, task, response, status); 96 __func__, task, response, status);
97 97
98 task->lldd_task = NULL; 98 task->lldd_task = NULL;
99 99
100 isci_execpath_callback(ihost, task, task->task_done); 100 isci_execpath_callback(ihost, task, task->task_done);
101 break; 101 break;
102 102
103 case isci_perform_aborted_io_completion: 103 case isci_perform_aborted_io_completion:
104 /* No notification because this request is already in the 104 /*
105 * abort path. 105 * No notification because this request is already in the
106 */ 106 * abort path.
107 dev_dbg(&ihost->pdev->dev, 107 */
108 "%s: Aborted - task = %p, response=%d, " 108 dev_dbg(&ihost->pdev->dev,
109 "status=%d\n", 109 "%s: Aborted - task = %p, response=%d, "
110 __func__, task, response, status); 110 "status=%d\n",
111 break; 111 __func__, task, response, status);
112 break;
112 113
113 case isci_perform_error_io_completion: 114 case isci_perform_error_io_completion:
114 /* Use sas_task_abort */ 115 /* Use sas_task_abort */
115 dev_dbg(&ihost->pdev->dev, 116 dev_dbg(&ihost->pdev->dev,
116 "%s: Error - task = %p, response=%d, " 117 "%s: Error - task = %p, response=%d, "
117 "status=%d\n", 118 "status=%d\n",
118 __func__, task, response, status); 119 __func__, task, response, status);
119 120
120 isci_execpath_callback(ihost, task, sas_task_abort); 121 isci_execpath_callback(ihost, task, sas_task_abort);
121 break; 122 break;
122 123
123 default: 124 default:
124 dev_dbg(&ihost->pdev->dev, 125 dev_dbg(&ihost->pdev->dev,
125 "%s: isci task notification default case!", 126 "%s: isci task notification default case!",
126 __func__); 127 __func__);
127 sas_task_abort(task); 128 sas_task_abort(task);
128 break; 129 break;
129 } 130 }
130} 131}
131 132
@@ -1056,7 +1057,7 @@ int isci_task_abort_task(struct sas_task *task)
1056 dev_dbg(&isci_host->pdev->dev, 1057 dev_dbg(&isci_host->pdev->dev,
1057 "%s: old_request == %p\n", __func__, old_request); 1058 "%s: old_request == %p\n", __func__, old_request);
1058 1059
1059 any_dev_reset = isci_device_is_reset_pending(isci_host,isci_device); 1060 any_dev_reset = isci_device_is_reset_pending(isci_host, isci_device);
1060 1061
1061 spin_lock_irqsave(&task->task_state_lock, flags); 1062 spin_lock_irqsave(&task->task_state_lock, flags);
1062 1063
@@ -1115,9 +1116,9 @@ int isci_task_abort_task(struct sas_task *task)
1115 __func__, task); 1116 __func__, task);
1116 } 1117 }
1117 goto out; 1118 goto out;
1118 } 1119 } else {
1119 else
1120 spin_unlock_irqrestore(&task->task_state_lock, flags); 1120 spin_unlock_irqrestore(&task->task_state_lock, flags);
1121 }
1121 1122
1122 spin_lock_irqsave(&isci_host->scic_lock, flags); 1123 spin_lock_irqsave(&isci_host->scic_lock, flags);
1123 1124