1 files changed, 1 insertions, 16 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 1e3f978ee6da..254521319150 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -117,10 +117,6 @@ static int dropless_fc;
 module_param(dropless_fc, int, 0);
 MODULE_PARM_DESC(dropless_fc, " Pause on exhausted host ring");
 
-static int poll;
-module_param(poll, int, 0);
-MODULE_PARM_DESC(poll, " Use polling (for debug)");
-
 static int mrrs = -1;
 module_param(mrrs, int, 0);
 MODULE_PARM_DESC(mrrs, " Force Max Read Req Size (0..3) (for debug)");
@@ -4834,20 +4830,11 @@ void bnx2x_drv_pulse(struct bnx2x *bp)
 
 static void bnx2x_timer(unsigned long data)
 {
-        u8 cos;
         struct bnx2x *bp = (struct bnx2x *) data;
 
         if (!netif_running(bp->dev))
                 return;
 
-        if (poll) {
-                struct bnx2x_fastpath *fp = &bp->fp[0];
-
-                for_each_cos_in_tx_queue(fp, cos)
-                        bnx2x_tx_int(bp, &fp->txdata[cos]);
-                bnx2x_rx_int(fp, 1000);
-        }
-
         if (!BP_NOMCP(bp)) {
                 int mb_idx = BP_FW_MB_IDX(bp);
                 u32 drv_pulse;
@@ -10063,7 +10050,6 @@ static void __devinit bnx2x_set_modes_bitmap(struct bnx2x *bp)
 static int __devinit bnx2x_init_bp(struct bnx2x *bp)
 {
         int func;
-        int timer_interval;
         int rc;
 
         mutex_init(&bp->port.phy_mutex);
@@ -10139,8 +10125,7 @@ static int __devinit bnx2x_init_bp(struct bnx2x *bp)
         bp->tx_ticks = (50 / BNX2X_BTR) * BNX2X_BTR;
         bp->rx_ticks = (25 / BNX2X_BTR) * BNX2X_BTR;
 
-        timer_interval = (CHIP_REV_IS_SLOW(bp) ? 5*HZ : HZ);
-        bp->current_interval = (poll ? poll : timer_interval);
+        bp->current_interval = CHIP_REV_IS_SLOW(bp) ? 5*HZ : HZ;
 
         init_timer(&bp->timer);
         bp->timer.expires = jiffies + bp->current_interval;