be2iscsi: Remove unused mcc_cq_lock

Orabug: 22725588

mcc_cq_lock spin_lock is used only in beiscsi_process_mcc which is
called only when all interrupts are disabled from mgmt_epfw_cleanup
during unloading of driver. There is no other context where there can be
contention for the processing of CQ.

Signed-off-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Dan Duval <dan.duval@oracle.com>

diff --git a/drivers/scsi/be2iscsi/be.h b/drivers/scsi/be2iscsi/be.h
index e26bd1ede51e8e2921c5df520931819da486b90a..d06e6d3f92b6f7c9d128f35d844975c6a1b31f75 100644 (file)
--- a/drivers/scsi/be2iscsi/be.h
+++ b/drivers/scsi/be2iscsi/be.h
@@ -132,7 +132,6 @@ struct be_ctrl_info {
        /* MCC Rings */
        struct be_mcc_obj mcc_obj;
        spinlock_t mcc_lock;    /* For serializing mcc cmds to BE card */
-       spinlock_t mcc_cq_lock;
 
        wait_queue_head_t mcc_wait[MAX_MCC_CMD + 1];
        unsigned int mcc_tag[MAX_MCC_CMD];

diff --git a/drivers/scsi/be2iscsi/be_cmds.c b/drivers/scsi/be2iscsi/be_cmds.c
index 78be16f3cbea8e6fe3c84665b00be5bedc5daf2a..6dd6b3bc5cd9aff26cb1207b983a62e4a22d6187 100644 (file)
--- a/drivers/scsi/be2iscsi/be_cmds.c
+++ b/drivers/scsi/be2iscsi/be_cmds.c
@@ -532,7 +532,6 @@ int beiscsi_process_mcc(struct beiscsi_hba *phba)
        int num = 0, status = 0;
        struct be_ctrl_info *ctrl = &phba->ctrl;
 
-       spin_lock_bh(&phba->ctrl.mcc_cq_lock);
        while ((compl = be_mcc_compl_get(phba))) {
                if (compl->flags & CQE_FLAGS_ASYNC_MASK) {
                        beiscsi_process_async_event(phba, compl);
@@ -547,7 +546,6 @@ int beiscsi_process_mcc(struct beiscsi_hba *phba)
        if (num)
                hwi_ring_cq_db(phba, phba->ctrl.mcc_obj.cq.id, num, 1);
 
-       spin_unlock_bh(&phba->ctrl.mcc_cq_lock);
        return status;
 }
 

diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 83c973f941057da8286ba60fd6947c8accdab79a..62eb575fa3b85ccb1089952545b3a8c528eba0e4 100644 (file)
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -717,7 +717,6 @@ static int be_ctrl_init(struct beiscsi_hba *phba, struct pci_dev *pdev)
        memset(mbox_mem_align->va, 0, sizeof(struct be_mcc_mailbox));
        mutex_init(&ctrl->mbox_lock);
        spin_lock_init(&phba->ctrl.mcc_lock);
-       spin_lock_init(&phba->ctrl.mcc_cq_lock);
 
        return status;
 }