Use setup_timer function instead of initializing timer with the
    function and data fields.
Signed-off-by: Allen Pais <allen.lkml@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
        bnx2_set_default_link(bp);
        bp->req_flow_ctrl = FLOW_CTRL_RX | FLOW_CTRL_TX;
 
-       init_timer(&bp->timer);
+       setup_timer(&bp->timer, bnx2_timer, (unsigned long)bp);
        bp->timer.expires = RUN_AT(BNX2_TIMER_INTERVAL);
-       bp->timer.data = (unsigned long) bp;
-       bp->timer.function = bnx2_timer;
 
 #ifdef BCM_CNIC
        if (bnx2_shmem_rd(bp, BNX2_ISCSI_INITIATOR) & BNX2_ISCSI_INITIATOR_EN)