diff options
| author | Allen Pais <allen.lkml@gmail.com> | 2017-09-21 19:04:22 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-21 20:44:38 +0200 |
| commit | 4f88836d4f806d212361eb426bc8a6ce897dbef9 (patch) | |
| tree | b7aeb45482d8637fbf11f0e0a75a5aa4ef4b373b | |
| parent | Merge branch 'mlxsw-Multicast-flood-update' (diff) | |
| download | linux-4f88836d4f806d212361eb426bc8a6ce897dbef9.tar.xz linux-4f88836d4f806d212361eb426bc8a6ce897dbef9.zip | |
drivers: net: de4x: 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/dec/tulip/de4x5.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c index 0affee9c8aa2..299812e92db7 100644 --- a/drivers/net/ethernet/dec/tulip/de4x5.c +++ b/drivers/net/ethernet/dec/tulip/de4x5.c @@ -1147,9 +1147,8 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev) lp->timeout = -1; lp->gendev = gendev; spin_lock_init(&lp->lock); - init_timer(&lp->timer); - lp->timer.function = (void (*)(unsigned long))de4x5_ast; - lp->timer.data = (unsigned long)dev; + setup_timer(&lp->timer, (void (*)(unsigned long))de4x5_ast, + (unsigned long)dev); de4x5_parse_params(dev); /* |