aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/bnx2.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index dc6f26190f36..c06549997ada 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -294,7 +294,6 @@ bnx2_ctx_wr(struct bnx2 *bp, u32 cid_addr, u32 offset, u32 val)
294 REG_WR(bp, BNX2_CTX_CTX_CTRL, 294 REG_WR(bp, BNX2_CTX_CTX_CTRL,
295 offset | BNX2_CTX_CTX_CTRL_WRITE_REQ); 295 offset | BNX2_CTX_CTX_CTRL_WRITE_REQ);
296 for (i = 0; i < 5; i++) { 296 for (i = 0; i < 5; i++) {
297 u32 val;
298 val = REG_RD(bp, BNX2_CTX_CTX_CTRL); 297 val = REG_RD(bp, BNX2_CTX_CTX_CTRL);
299 if ((val & BNX2_CTX_CTX_CTRL_WRITE_REQ) == 0) 298 if ((val & BNX2_CTX_CTX_CTRL_WRITE_REQ) == 0)
300 break; 299 break;
@@ -7458,7 +7457,6 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
7458 reg &= BNX2_CONDITION_MFW_RUN_MASK; 7457 reg &= BNX2_CONDITION_MFW_RUN_MASK;
7459 if (reg != BNX2_CONDITION_MFW_RUN_UNKNOWN && 7458 if (reg != BNX2_CONDITION_MFW_RUN_UNKNOWN &&
7460 reg != BNX2_CONDITION_MFW_RUN_NONE) { 7459 reg != BNX2_CONDITION_MFW_RUN_NONE) {
7461 int i;
7462 u32 addr = bnx2_shmem_rd(bp, BNX2_MFW_VER_PTR); 7460 u32 addr = bnx2_shmem_rd(bp, BNX2_MFW_VER_PTR);
7463 7461
7464 bp->fw_version[j++] = ' '; 7462 bp->fw_version[j++] = ' ';