scsi: be2iscsi: Remove alloc_mcc_tag & beiscsi_pci_soft_reset

alloc_mcc_tag was replaced with alloc_mcc_wrb and is no more used.
beiscsi_pci_soft_reset is not used at all and won't be needed.

Signed-off-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/be2iscsi/be_cmds.c b/drivers/scsi/be2iscsi/be_cmds.c
index 59b8e2dc3aca6c4ba5f87e407ea356e91c675c71..403296239ae93093dfe7fab2501d3d514fab3f06 100644 (file)
--- a/drivers/scsi/be2iscsi/be_cmds.c
+++ b/drivers/scsi/be2iscsi/be_cmds.c
@@ -21,60 +21,6 @@
 #include "be.h"
 #include "be_mgmt.h"
 
-int beiscsi_pci_soft_reset(struct beiscsi_hba *phba)
-{
-       u32 sreset;
-       u8 *pci_reset_offset = 0;
-       u8 *pci_online0_offset = 0;
-       u8 *pci_online1_offset = 0;
-       u32 pconline0 = 0;
-       u32 pconline1 = 0;
-       u32 i;
-
-       pci_reset_offset = (u8 *)phba->pci_va + BE2_SOFT_RESET;
-       pci_online0_offset = (u8 *)phba->pci_va + BE2_PCI_ONLINE0;
-       pci_online1_offset = (u8 *)phba->pci_va + BE2_PCI_ONLINE1;
-       sreset = readl((void *)pci_reset_offset);
-       sreset |= BE2_SET_RESET;
-       writel(sreset, (void *)pci_reset_offset);
-
-       i = 0;
-       while (sreset & BE2_SET_RESET) {
-               if (i > 64)
-                       break;
-               msleep(100);
-               sreset = readl((void *)pci_reset_offset);
-               i++;
-       }
-
-       if (sreset & BE2_SET_RESET) {
-               printk(KERN_ERR DRV_NAME
-                      " Soft Reset  did not deassert\n");
-               return -EIO;
-       }
-       pconline1 = BE2_MPU_IRAM_ONLINE;
-       writel(pconline0, (void *)pci_online0_offset);
-       writel(pconline1, (void *)pci_online1_offset);
-
-       sreset |= BE2_SET_RESET;
-       writel(sreset, (void *)pci_reset_offset);
-
-       i = 0;
-       while (sreset & BE2_SET_RESET) {
-               if (i > 64)
-                       break;
-               msleep(1);
-               sreset = readl((void *)pci_reset_offset);
-               i++;
-       }
-       if (sreset & BE2_SET_RESET) {
-               printk(KERN_ERR DRV_NAME
-                      " MPU Online Soft Reset did not deassert\n");
-               return -EIO;
-       }
-       return 0;
-}
-
 int be_chk_reset_complete(struct beiscsi_hba *phba)
 {
        unsigned int num_loop;
@@ -104,28 +50,6 @@ int be_chk_reset_complete(struct beiscsi_hba *phba)
        return 0;
 }
 
-unsigned int alloc_mcc_tag(struct beiscsi_hba *phba)
-{
-       unsigned int tag = 0;
-
-       spin_lock(&phba->ctrl.mcc_lock);
-       if (phba->ctrl.mcc_tag_available) {
-               tag = phba->ctrl.mcc_tag[phba->ctrl.mcc_alloc_index];
-               phba->ctrl.mcc_tag[phba->ctrl.mcc_alloc_index] = 0;
-               phba->ctrl.mcc_tag_status[tag] = 0;
-               phba->ctrl.ptag_state[tag].tag_state = 0;
-       }
-       if (tag) {
-               phba->ctrl.mcc_tag_available--;
-               if (phba->ctrl.mcc_alloc_index == (MAX_MCC_CMD - 1))
-                       phba->ctrl.mcc_alloc_index = 0;
-               else
-                       phba->ctrl.mcc_alloc_index++;
-       }
-       spin_unlock(&phba->ctrl.mcc_lock);
-       return tag;
-}
-
 struct be_mcc_wrb *alloc_mcc_wrb(struct beiscsi_hba *phba,
                                 unsigned int *ref_tag)
 {

diff --git a/drivers/scsi/be2iscsi/be_cmds.h b/drivers/scsi/be2iscsi/be_cmds.h
index a4bc83cbec9ed1780a06b3f2294bc271e7f7336e..c50b74afd00aeca4f544122aee68696b309f0fb7 100644 (file)
--- a/drivers/scsi/be2iscsi/be_cmds.h
+++ b/drivers/scsi/be2iscsi/be_cmds.h
@@ -1376,7 +1376,6 @@ struct be_cmd_get_port_name {
                                                 * the cxn
                                                 */
 
-int beiscsi_pci_soft_reset(struct beiscsi_hba *phba);
 int be_chk_reset_complete(struct beiscsi_hba *phba);
 
 void be_wrb_hdr_prepare(struct be_mcc_wrb *wrb, int payload_len,