isci: Remove isci_device reqs_in_process and dev_node from isci_device.

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

diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c
index 39f12703b8937db22abf0c39005fc5873e72e08e..f2a8a3346307d29a83502035b1c5b1b4a4957650 100644 (file)
--- a/drivers/scsi/isci/init.c
+++ b/drivers/scsi/isci/init.c
@@ -569,7 +569,6 @@ static struct isci_host *isci_host_alloc(struct pci_dev *pdev, int id)
        for (i = 0; i < SCI_MAX_REMOTE_DEVICES; i++) {
                struct isci_remote_device *idev = &ihost->devices[i];
 
-               INIT_LIST_HEAD(&idev->reqs_in_process);
                INIT_LIST_HEAD(&idev->node);
        }
 

diff --git a/drivers/scsi/isci/remote_device.c b/drivers/scsi/isci/remote_device.c
index b26ab05107dd8a550845fd281fa8e5aa43baf502..b14eff3c76d047994775e1d7b7dd169f33f6642d 100644 (file)
--- a/drivers/scsi/isci/remote_device.c
+++ b/drivers/scsi/isci/remote_device.c
@@ -919,7 +919,7 @@ static void isci_remote_device_deconstruct(struct isci_host *ihost, struct isci_
         * here should go through isci_remote_device_nuke_requests.
         * If we hit this condition, we will need a way to complete
         * io requests in process */
-       BUG_ON(!list_empty(&idev->reqs_in_process));
+       BUG_ON(idev->started_request_count > 0);
 
        sci_remote_device_destruct(idev);
        list_del_init(&idev->node);
@@ -1345,10 +1345,6 @@ isci_remote_device_alloc(struct isci_host *ihost, struct isci_port *iport)
                dev_warn(&ihost->pdev->dev, "%s: failed\n", __func__);
                return NULL;
        }
-
-       if (WARN_ONCE(!list_empty(&idev->reqs_in_process), "found requests in process\n"))
-               return NULL;
-
        if (WARN_ONCE(!list_empty(&idev->node), "found non-idle remote device\n"))
                return NULL;
 

diff --git a/drivers/scsi/isci/remote_device.h b/drivers/scsi/isci/remote_device.h
index da43698e9ebada5d5cf04efdc74367c7f31ba800..8b7817cf4352f635f1182c69828c788c9255d099 100644 (file)
--- a/drivers/scsi/isci/remote_device.h
+++ b/drivers/scsi/isci/remote_device.h
@@ -90,7 +90,6 @@ struct isci_remote_device {
        struct isci_port *isci_port;
        struct domain_device *domain_dev;
        struct list_head node;
-       struct list_head reqs_in_process;
        struct sci_base_state_machine sm;
        u32 device_port_width;
        enum sas_linkrate connection_rate;

diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c
index f4e80f31423cac59ffb2be2c7559e078ddd8b571..662f36de8052431ea9f6d9c30a173d347f621ac0 100644 (file)
--- a/drivers/scsi/isci/request.c
+++ b/drivers/scsi/isci/request.c
@@ -2956,9 +2956,6 @@ static void isci_request_io_request_complete(struct isci_host *ihost,
        /* Add to the completed list. */
        list_add(&request->completed_node, &ihost->requests_to_complete);
 
-       /* Take the request off the device's pending request list. */
-       list_del_init(&request->dev_node);
-
        /* complete the io request to the core. */
        sci_controller_complete_io(ihost, request->target_device, request);
 
@@ -3412,7 +3409,6 @@ static struct isci_request *isci_request_from_tag(struct isci_host *ihost, u16 t
        ireq->flags = 0;
        ireq->num_sg_entries = 0;
        INIT_LIST_HEAD(&ireq->completed_node);
-       INIT_LIST_HEAD(&ireq->dev_node);
 
        return ireq;
 }
@@ -3496,17 +3492,9 @@ int isci_request_execute(struct isci_host *ihost, struct isci_remote_device *ide
                spin_unlock_irqrestore(&ihost->scic_lock, flags);
                return status;
        }
-
        /* Either I/O started OK, or the core has signaled that
         * the device needs a target reset.
-        *
-        * In either case, hold onto the I/O for later.
-        *
-        * Update it's status and add it to the list in the
-        * remote device object.
         */
-       list_add(&ireq->dev_node, &idev->reqs_in_process);
-
        if (status != SCI_SUCCESS) {
                /* The request did not really start in the
                 * hardware, so clear the request handle

diff --git a/drivers/scsi/isci/request.h b/drivers/scsi/isci/request.h
index f3116a51235faf74ad29f4a8c17a9c575b6101bb..d12e97531da8ab60c376a89ba0ffa52958299731 100644 (file)
--- a/drivers/scsi/isci/request.h
+++ b/drivers/scsi/isci/request.h
@@ -96,8 +96,6 @@ struct isci_request {
        struct isci_host *isci_host;
        /* For use in the requests_to_{complete|abort} lists: */
        struct list_head completed_node;
-       /* For use in the reqs_in_process list: */
-       struct list_head dev_node;
        dma_addr_t request_daddr;
        dma_addr_t zero_scatter_daddr;
        unsigned int num_sg_entries;

diff --git a/drivers/scsi/isci/task.c b/drivers/scsi/isci/task.c
index 9d8720d6266c1d55e813cf1571fc689893c9c367..222fb0de4d59d52470898bbd98a920032c5e00c8 100644 (file)
--- a/drivers/scsi/isci/task.c
+++ b/drivers/scsi/isci/task.c
@@ -317,9 +317,6 @@ static int isci_task_execute_tmf(struct isci_host *ihost,
                spin_unlock_irqrestore(&ihost->scic_lock, flags);
                goto err_tci;
        }
-       /* add the request to the remote device request list. */
-       list_add(&ireq->dev_node, &idev->reqs_in_process);
-
        /* The RNC must be unsuspended before the TMF can get a response. */
        sci_remote_device_resume(idev, NULL, NULL);
 
@@ -721,7 +718,6 @@ isci_task_request_complete(struct isci_host *ihost,
        set_bit(IREQ_TERMINATED, &ireq->flags);
 
        isci_free_tag(ihost, ireq->io_tag);
-       list_del_init(&ireq->dev_node);
 
        /* The task management part completes last. */
        if (tmf_complete)