]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
drivers: net: bnxt: use setup_timer() helper.
authorAllen Pais <allen.lkml@gmail.com>
Thu, 21 Sep 2017 17:05:08 +0000 (22:35 +0530)
committerJack Vogel <jack.vogel@oracle.com>
Fri, 9 Mar 2018 04:50:12 +0000 (20:50 -0800)
Orabug: 2764835527648339

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>
(cherry picked from commit 6c43824477c2ac722325ba460c2ce683c48fb76b)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Reviewed-by: Jack Vogel <jack.vogel@oracle.com>
drivers/net/ethernet/broadcom/bnxt/bnxt.c

index 5ebb75996105da0ed085d57f1cf70161b1adf6a0..552c7796ce87498201efc866f8ab5056e6414fc4 100644 (file)
@@ -7158,9 +7158,7 @@ static int bnxt_init_board(struct pci_dev *pdev, struct net_device *dev)
 
        bp->stats_coal_ticks = BNXT_DEF_STATS_COAL_TICKS;
 
-       init_timer(&bp->timer);
-       bp->timer.data = (unsigned long)bp;
-       bp->timer.function = bnxt_timer;
+       setup_timer(&bp->timer, bnxt_timer, (unsigned long)bp);
        bp->current_interval = BNXT_TIMER_INTERVAL;
 
        clear_bit(BNXT_STATE_OPEN, &bp->state);