scsi: qla2xxx: Remove nvme_done_list

Signed-off-by: Darren Trapp <darren.trapp@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 59c449b141cde3f993f852b4a7c76183bd4b32f0..6aae126add0ca6ff10797a4b7c60837e83226790 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -3464,7 +3464,6 @@ struct qla_qpair {
        struct work_struct q_work;
        struct list_head qp_list_elem; /* vha->qp_list */
        struct list_head hints_list;
-       struct list_head nvme_done_list;
        uint16_t cpuid;
        struct qla_tgt_counters tgt_counters;
 };

diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index e9295398050c827964ad323443cea73abdc38014..19f44e12926b2ba2fc91c084549f2cafb2ef6cbb 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -896,6 +896,4 @@ void qlt_update_host_map(struct scsi_qla_host *, port_id_t);
 void qlt_remove_target_resources(struct qla_hw_data *);
 void qlt_clr_qp_table(struct scsi_qla_host *vha);
 
-void qla_nvme_cmpl_io(struct srb_iocb *);
-
 #endif /* _QLA_GBL_H */

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 7f8bfa0454d2d8b8bc0b8ecb5975195a86fc135f..33823d74c78241197ef2a61098be5eebc8bb80ed 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -8405,7 +8405,6 @@ struct qla_qpair *qla2xxx_create_qpair(struct scsi_qla_host *vha, int qos,
                qpair->vp_idx = vp_idx;
                qpair->fw_started = ha->flags.fw_started;
                INIT_LIST_HEAD(&qpair->hints_list);
-               INIT_LIST_HEAD(&qpair->nvme_done_list);
                qpair->chip_reset = ha->base_qpair->chip_reset;
                qpair->enable_class_2 = ha->base_qpair->enable_class_2;
                qpair->enable_explicit_conf =

diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index e965b16f21e3d74bea6a2e491a4a89254dee051a..da85cd89639ff20d572f76866dc8e331aeb12ccd 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -778,18 +778,12 @@ static void qla_do_work(struct work_struct *work)
        struct qla_qpair *qpair = container_of(work, struct qla_qpair, q_work);
        struct scsi_qla_host *vha;
        struct qla_hw_data *ha = qpair->hw;
-       struct srb_iocb *nvme, *nxt_nvme;
 
        spin_lock_irqsave(&qpair->qp_lock, flags);
        vha = pci_get_drvdata(ha->pdev);
        qla24xx_process_response_queue(vha, qpair->rsp);
        spin_unlock_irqrestore(&qpair->qp_lock, flags);
 
-       list_for_each_entry_safe(nvme, nxt_nvme, &qpair->nvme_done_list,
-                   u.nvme.entry) {
-               list_del_init(&nvme->u.nvme.entry);
-               qla_nvme_cmpl_io(nvme);
-       }
 }
 
 /* create response queue */

diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c
index adeda6a4e4fd3a6ceff725eb961e23d03afb0519..8c05df30c0838d7e15f31e79568ff7510d1f7b17 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_nvme.c
+++ b/drivers/scsi/qla2xxx/qla_nvme.c
@@ -149,16 +149,6 @@ static void qla_nvme_sp_ls_done(void *ptr, int res)
        qla2x00_rel_sp(sp);
 }
 
-void qla_nvme_cmpl_io(struct srb_iocb *nvme)
-{
-       srb_t *sp;
-       struct nvmefc_fcp_req *fd = nvme->u.nvme.desc;
-
-       sp = container_of(nvme, srb_t, u.iocb_cmd);
-       fd->done(fd);
-       qla2xxx_rel_qpair_sp(sp->qpair, sp);
-}
-
 static void qla_nvme_sp_done(void *ptr, int res)
 {
        srb_t *sp = ptr;
@@ -177,7 +167,8 @@ static void qla_nvme_sp_done(void *ptr, int res)
                fd->status = NVME_SC_INTERNAL;
 
        fd->rcv_rsplen = nvme->u.nvme.rsp_pyld_len;
-       list_add_tail(&nvme->u.nvme.entry, &sp->qpair->nvme_done_list);
+       fd->done(fd);
+       qla2xxx_rel_qpair_sp(sp->qpair, sp);
 
        return;
 }

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 12ee6e02d146d169940ead69af93d42d79d6508b..bd37a243c0bd0673db84632e28a615e3c91de575 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -397,7 +397,6 @@ static void qla_init_base_qpair(struct scsi_qla_host *vha, struct req_que *req,
        ha->base_qpair->use_shadow_reg = IS_SHADOW_REG_CAPABLE(ha) ? 1 : 0;
        ha->base_qpair->msix = &ha->msix_entries[QLA_MSIX_RSP_Q];
        INIT_LIST_HEAD(&ha->base_qpair->hints_list);
-       INIT_LIST_HEAD(&ha->base_qpair->nvme_done_list);
        ha->base_qpair->enable_class_2 = ql2xenableclass2;
        /* init qpair to this cpu. Will adjust at run time. */
        qla_cpu_update(rsp->qpair, raw_smp_processor_id());