bnx2x: remove unnecessary dmae code

Removed uninformative debug prints, as well as two functions
which were hardly used in the code.

Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index db5fb4e151279fad0077f6332c1dc569d25ac6b7..a2324a8629931443aa223fc8723a6d288fefbf73 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -308,67 +308,6 @@ static u32 bnx2x_reg_rd_ind(struct bnx2x *bp, u32 addr)
 #define DMAE_DP_DST_PCI                "pci dst_addr [%x:%08x]"
 #define DMAE_DP_DST_NONE       "dst_addr [none]"
 
-static void bnx2x_dp_dmae(struct bnx2x *bp, struct dmae_command *dmae,
-                         int msglvl)
-{
-       u32 src_type = dmae->opcode & DMAE_COMMAND_SRC;
-
-       switch (dmae->opcode & DMAE_COMMAND_DST) {
-       case DMAE_CMD_DST_PCI:
-               if (src_type == DMAE_CMD_SRC_PCI)
-                       DP(msglvl, "DMAE: opcode 0x%08x\n"
-                          "src [%x:%08x], len [%d*4], dst [%x:%08x]\n"
-                          "comp_addr [%x:%08x], comp_val 0x%08x\n",
-                          dmae->opcode, dmae->src_addr_hi, dmae->src_addr_lo,
-                          dmae->len, dmae->dst_addr_hi, dmae->dst_addr_lo,
-                          dmae->comp_addr_hi, dmae->comp_addr_lo,
-                          dmae->comp_val);
-               else
-                       DP(msglvl, "DMAE: opcode 0x%08x\n"
-                          "src [%08x], len [%d*4], dst [%x:%08x]\n"
-                          "comp_addr [%x:%08x], comp_val 0x%08x\n",
-                          dmae->opcode, dmae->src_addr_lo >> 2,
-                          dmae->len, dmae->dst_addr_hi, dmae->dst_addr_lo,
-                          dmae->comp_addr_hi, dmae->comp_addr_lo,
-                          dmae->comp_val);
-               break;
-       case DMAE_CMD_DST_GRC:
-               if (src_type == DMAE_CMD_SRC_PCI)
-                       DP(msglvl, "DMAE: opcode 0x%08x\n"
-                          "src [%x:%08x], len [%d*4], dst_addr [%08x]\n"
-                          "comp_addr [%x:%08x], comp_val 0x%08x\n",
-                          dmae->opcode, dmae->src_addr_hi, dmae->src_addr_lo,
-                          dmae->len, dmae->dst_addr_lo >> 2,
-                          dmae->comp_addr_hi, dmae->comp_addr_lo,
-                          dmae->comp_val);
-               else
-                       DP(msglvl, "DMAE: opcode 0x%08x\n"
-                          "src [%08x], len [%d*4], dst [%08x]\n"
-                          "comp_addr [%x:%08x], comp_val 0x%08x\n",
-                          dmae->opcode, dmae->src_addr_lo >> 2,
-                          dmae->len, dmae->dst_addr_lo >> 2,
-                          dmae->comp_addr_hi, dmae->comp_addr_lo,
-                          dmae->comp_val);
-               break;
-       default:
-               if (src_type == DMAE_CMD_SRC_PCI)
-                       DP(msglvl, "DMAE: opcode 0x%08x\n"
-                          "src_addr [%x:%08x]  len [%d * 4]  dst_addr [none]\n"
-                          "comp_addr [%x:%08x]  comp_val 0x%08x\n",
-                          dmae->opcode, dmae->src_addr_hi, dmae->src_addr_lo,
-                          dmae->len, dmae->comp_addr_hi, dmae->comp_addr_lo,
-                          dmae->comp_val);
-               else
-                       DP(msglvl, "DMAE: opcode 0x%08x\n"
-                          "src_addr [%08x]  len [%d * 4]  dst_addr [none]\n"
-                          "comp_addr [%x:%08x]  comp_val 0x%08x\n",
-                          dmae->opcode, dmae->src_addr_lo >> 2,
-                          dmae->len, dmae->comp_addr_hi, dmae->comp_addr_lo,
-                          dmae->comp_val);
-               break;
-       }
-
-}
 
 /* copy command into DMAE command memory and set DMAE command go */
 void bnx2x_post_dmae(struct bnx2x *bp, struct dmae_command *dmae, int idx)
@@ -505,8 +444,6 @@ void bnx2x_write_dmae(struct bnx2x *bp, dma_addr_t dma_addr, u32 dst_addr,
        dmae.dst_addr_hi = 0;
        dmae.len = len32;
 
-       bnx2x_dp_dmae(bp, &dmae, BNX2X_MSG_OFF);
-
        /* issue the command and wait for completion */
        bnx2x_issue_dmae_with_comp(bp, &dmae);
 }
@@ -539,8 +476,6 @@ void bnx2x_read_dmae(struct bnx2x *bp, u32 src_addr, u32 len32)
        dmae.dst_addr_hi = U64_HI(bnx2x_sp_mapping(bp, wb_data));
        dmae.len = len32;
 
-       bnx2x_dp_dmae(bp, &dmae, BNX2X_MSG_OFF);
-
        /* issue the command and wait for completion */
        bnx2x_issue_dmae_with_comp(bp, &dmae);
 }
@@ -561,27 +496,6 @@ static void bnx2x_write_dmae_phys_len(struct bnx2x *bp, dma_addr_t phys_addr,
        bnx2x_write_dmae(bp, phys_addr + offset, addr + offset, len);
 }
 
-/* used only for slowpath so not inlined */
-static void bnx2x_wb_wr(struct bnx2x *bp, int reg, u32 val_hi, u32 val_lo)
-{
-       u32 wb_write[2];
-
-       wb_write[0] = val_hi;
-       wb_write[1] = val_lo;
-       REG_WR_DMAE(bp, reg, wb_write, 2);
-}
-
-#ifdef USE_WB_RD
-static u64 bnx2x_wb_rd(struct bnx2x *bp, int reg)
-{
-       u32 wb_data[2];
-
-       REG_RD_DMAE(bp, reg, wb_data, 2);
-
-       return HILO_U64(wb_data[0], wb_data[1]);
-}
-#endif
-
 static int bnx2x_mc_assert(struct bnx2x *bp)
 {
        char last_idx;
@@ -6639,13 +6553,16 @@ static int bnx2x_init_hw_port(struct bnx2x *bp)
 static void bnx2x_ilt_wr(struct bnx2x *bp, u32 index, dma_addr_t addr)
 {
        int reg;
+       u32 wb_write[2];
 
        if (CHIP_IS_E1(bp))
                reg = PXP2_REG_RQ_ONCHIP_AT + index*8;
        else
                reg = PXP2_REG_RQ_ONCHIP_AT_B0 + index*8;
 
-       bnx2x_wb_wr(bp, reg, ONCHIP_ADDR1(addr), ONCHIP_ADDR2(addr));
+       wb_write[0] = ONCHIP_ADDR1(addr);
+       wb_write[1] = ONCHIP_ADDR2(addr);
+       REG_WR_DMAE(bp, reg, wb_write, 2);
 }
 
 static inline void bnx2x_igu_clear_sb(struct bnx2x *bp, u8 idu_sb_id)