summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Pais <allen.lkml@gmail.com>2017-09-21 19:04:23 +0200
committerDavid S. Miller <davem@davemloft.net>2017-09-21 20:44:39 +0200
commitcdc91b31b81abaa2cf491fd5e9007f4bcd45bc68 (patch)
tree7006bd5fb375635b0683d57bbd0778d7ec9f68bc
parentdrivers: net: de4x: use setup_timer() helper. (diff)
downloadlinux-cdc91b31b81abaa2cf491fd5e9007f4bcd45bc68.tar.xz
linux-cdc91b31b81abaa2cf491fd5e9007f4bcd45bc68.zip
drivers: net: b44: use setup_timer() helper.
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>
-rw-r--r--drivers/net/ethernet/broadcom/b44.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c
index a1125d10c825..42e44fc03a18 100644
--- a/drivers/net/ethernet/broadcom/b44.c
+++ b/drivers/net/ethernet/broadcom/b44.c
@@ -1474,10 +1474,8 @@ static int b44_open(struct net_device *dev)
goto out;
}
- init_timer(&bp->timer);
+ setup_timer(&bp->timer, b44_timer, (unsigned long)bp);
bp->timer.expires = jiffies + HZ;
- bp->timer.data = (unsigned long) bp;
- bp->timer.function = b44_timer;
add_timer(&bp->timer);
b44_enable_ints(bp);