[SCSI] isci: Remove redundant isci_request.ttype field.

Use the existing IREQ_TMF flag as a request type indicator.

Signed-off-by: Jeff Skirvin <jeffrey.d.skirvin@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/scsi/isci/remote_device.c b/drivers/scsi/isci/remote_device.c
index 20c77edd4711..9d9e33d2ed51 100644
--- a/drivers/scsi/isci/remote_device.c
+++ b/drivers/scsi/isci/remote_device.c
@@ -1463,15 +1463,12 @@ void isci_device_clear_reset_pending(struct isci_host *ihost, struct isci_remote
                 dev_dbg(&ihost->pdev->dev, "%s: idev = %p request = %p\n",
                          __func__, idev, isci_request);
 
-                if (isci_request->ttype == io_task) {
+                if (!test_bit(IREQ_TMF, &isci_request->flags)) {
+                        struct sas_task *task = isci_request_access_task(isci_request);
 
-                        unsigned long flags2;
-                        struct sas_task *task = isci_request_access_task(
-                                isci_request);
-
-                        spin_lock_irqsave(&task->task_state_lock, flags2);
+                        spin_lock(&task->task_state_lock);
                         task->task_state_flags &= ~SAS_TASK_NEED_DEV_RESET;
-                        spin_unlock_irqrestore(&task->task_state_lock, flags2);
+                        spin_unlock(&task->task_state_lock);
                 }
         }
         spin_unlock_irqrestore(&ihost->scic_lock, flags);