aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-04-17 19:56:12 -0400
committerDavid S. Miller <davem@davemloft.net>2011-04-17 19:56:12 -0400
commitb8ee8328bac0d8420d2b9ef4838d0df25df100ab (patch)
treefc4fa67c8e0287da2eca89b3f61373a0a948b2db
parent585985429080a449e0ecf66dd485899a8765c26c (diff)
bnx2x: Fix set-but-unused variables.
The variable 'rc' is set but unused in bnx2x_timer(). Similarly for 'hc_index_p' in bnx2x_init_sb(), and 'port' in bnx2x_get_hwinfo(). Just kill them off. Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/bnx2x/bnx2x_main.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index 696e84afdc53..bfd7ac98248b 100644
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@ -3904,10 +3904,9 @@ static void bnx2x_timer(unsigned long data)
3904 3904
3905 if (poll) { 3905 if (poll) {
3906 struct bnx2x_fastpath *fp = &bp->fp[0]; 3906 struct bnx2x_fastpath *fp = &bp->fp[0];
3907 int rc;
3908 3907
3909 bnx2x_tx_int(fp); 3908 bnx2x_tx_int(fp);
3910 rc = bnx2x_rx_int(fp, 1000); 3909 bnx2x_rx_int(fp, 1000);
3911 } 3910 }
3912 3911
3913 if (!BP_NOMCP(bp)) { 3912 if (!BP_NOMCP(bp)) {
@@ -4062,7 +4061,6 @@ static void bnx2x_init_sb(struct bnx2x *bp, dma_addr_t mapping, int vfid,
4062 struct hc_status_block_data_e2 sb_data_e2; 4061 struct hc_status_block_data_e2 sb_data_e2;
4063 struct hc_status_block_data_e1x sb_data_e1x; 4062 struct hc_status_block_data_e1x sb_data_e1x;
4064 struct hc_status_block_sm *hc_sm_p; 4063 struct hc_status_block_sm *hc_sm_p;
4065 struct hc_index_data *hc_index_p;
4066 int data_size; 4064 int data_size;
4067 u32 *sb_data_p; 4065 u32 *sb_data_p;
4068 4066
@@ -4083,7 +4081,6 @@ static void bnx2x_init_sb(struct bnx2x *bp, dma_addr_t mapping, int vfid,
4083 sb_data_e2.common.host_sb_addr.hi = U64_HI(mapping); 4081 sb_data_e2.common.host_sb_addr.hi = U64_HI(mapping);
4084 sb_data_e2.common.host_sb_addr.lo = U64_LO(mapping); 4082 sb_data_e2.common.host_sb_addr.lo = U64_LO(mapping);
4085 hc_sm_p = sb_data_e2.common.state_machine; 4083 hc_sm_p = sb_data_e2.common.state_machine;
4086 hc_index_p = sb_data_e2.index_data;
4087 sb_data_p = (u32 *)&sb_data_e2; 4084 sb_data_p = (u32 *)&sb_data_e2;
4088 data_size = sizeof(struct hc_status_block_data_e2)/sizeof(u32); 4085 data_size = sizeof(struct hc_status_block_data_e2)/sizeof(u32);
4089 } else { 4086 } else {
@@ -4097,7 +4094,6 @@ static void bnx2x_init_sb(struct bnx2x *bp, dma_addr_t mapping, int vfid,
4097 sb_data_e1x.common.host_sb_addr.hi = U64_HI(mapping); 4094 sb_data_e1x.common.host_sb_addr.hi = U64_HI(mapping);
4098 sb_data_e1x.common.host_sb_addr.lo = U64_LO(mapping); 4095 sb_data_e1x.common.host_sb_addr.lo = U64_LO(mapping);
4099 hc_sm_p = sb_data_e1x.common.state_machine; 4096 hc_sm_p = sb_data_e1x.common.state_machine;
4100 hc_index_p = sb_data_e1x.index_data;
4101 sb_data_p = (u32 *)&sb_data_e1x; 4097 sb_data_p = (u32 *)&sb_data_e1x;
4102 data_size = sizeof(struct hc_status_block_data_e1x)/sizeof(u32); 4098 data_size = sizeof(struct hc_status_block_data_e1x)/sizeof(u32);
4103 } 4099 }
@@ -8635,7 +8631,7 @@ static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)
8635static int __devinit bnx2x_get_hwinfo(struct bnx2x *bp) 8631static int __devinit bnx2x_get_hwinfo(struct bnx2x *bp)
8636{ 8632{
8637 int /*abs*/func = BP_ABS_FUNC(bp); 8633 int /*abs*/func = BP_ABS_FUNC(bp);
8638 int vn, port; 8634 int vn;
8639 u32 val = 0; 8635 u32 val = 0;
8640 int rc = 0; 8636 int rc = 0;
8641 8637
@@ -8670,7 +8666,6 @@ static int __devinit bnx2x_get_hwinfo(struct bnx2x *bp)
8670 bp->mf_ov = 0; 8666 bp->mf_ov = 0;
8671 bp->mf_mode = 0; 8667 bp->mf_mode = 0;
8672 vn = BP_E1HVN(bp); 8668 vn = BP_E1HVN(bp);
8673 port = BP_PORT(bp);
8674 8669
8675 if (!CHIP_IS_E1(bp) && !BP_NOMCP(bp)) { 8670 if (!CHIP_IS_E1(bp) && !BP_NOMCP(bp)) {
8676 DP(NETIF_MSG_PROBE, 8671 DP(NETIF_MSG_PROBE,