summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/isci/task.h
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2011-03-17 08:04:43 -0700
committerDan Williams <dan.j.williams@intel.com>2011-07-03 03:55:30 -0700
commitce0b89f35636f3a69fbde851aff8a284c4b4c22b (patch)
tree9a2ab94665f333ef3c6695a531d9474072b2aa4c /drivers/scsi/isci/task.h
parentc4b9e24c4be67aeed44cd46ef5ea92948d02a426 (diff)
downloadblackbird-op-linux-ce0b89f35636f3a69fbde851aff8a284c4b4c22b.tar.gz
blackbird-op-linux-ce0b89f35636f3a69fbde851aff8a284c4b4c22b.zip
isci: task.h compile and checkpatch fixes
A usage of "FALSE" leaked in as well as some checkpatch escapes. Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/task.h')
-rw-r--r--drivers/scsi/isci/task.h42
1 files changed, 19 insertions, 23 deletions
diff --git a/drivers/scsi/isci/task.h b/drivers/scsi/isci/task.h
index b84bedd94601..9754b43f5b0b 100644
--- a/drivers/scsi/isci/task.h
+++ b/drivers/scsi/isci/task.h
@@ -306,7 +306,6 @@ isci_task_set_completion_status(
* is in the error path.
*/
if (task->task_state_flags & SAS_TASK_NEED_DEV_RESET) {
-
/* Fail the I/O to make sure it goes into the error path. */
response = SAS_TASK_UNDELIVERED;
status = SAM_STAT_TASK_ABORTED;
@@ -317,28 +316,25 @@ isci_task_set_completion_status(
task->task_status.stat = status;
switch (task_notification_selection) {
-
- case isci_perform_aborted_io_completion:
- /* This path can occur with task-managed requests as well as
- * requests terminated because of LUN or device resets.
- */
- /* Fall through to the normal case... */
-
- case isci_perform_normal_io_completion:
- /* Normal notification (task_done) */
- isci_set_task_doneflags(task);
- break;
-
- default:
- WARN_ON(FALSE);
- /* Fall through to the error case... */
-
- case isci_perform_error_io_completion:
- /* Use sas_task_abort */
- /* Leave SAS_TASK_STATE_DONE clear
- * Leave SAS_TASK_AT_INITIATOR set.
- */
- break;
+ case isci_perform_aborted_io_completion:
+ /* This path can occur with task-managed requests as well as
+ * requests terminated because of LUN or device resets.
+ */
+ /* Fall through to the normal case... */
+ case isci_perform_normal_io_completion:
+ /* Normal notification (task_done) */
+ isci_set_task_doneflags(task);
+ break;
+ default:
+ WARN_ONCE(1, "unknown task_notification_selection: %d\n",
+ task_notification_selection);
+ /* Fall through to the error case... */
+ case isci_perform_error_io_completion:
+ /* Use sas_task_abort */
+ /* Leave SAS_TASK_STATE_DONE clear
+ * Leave SAS_TASK_AT_INITIATOR set.
+ */
+ break;
}
spin_unlock_irqrestore(&task->task_state_lock, flags);
OpenPOWER on IntegriCloud