[PATCH] drivers/net: arcnet: Convert timers to use timer_setup()
From: Kees Cook <hidden>
Date: 2017-10-25 10:54:17
Also in:
lkml
Subsystem:
arcnet network layer, networking drivers, the rest · Maintainers:
Michael Grzeschik, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. Cc: Michael Grzeschik <redacted> Cc: netdev@vger.kernel.org Signed-off-by: Kees Cook <redacted> --- drivers/net/arcnet/arcnet.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c
index 13236b2cdf13..8459115d9d4e 100644
--- a/drivers/net/arcnet/arcnet.c
+++ b/drivers/net/arcnet/arcnet.c@@ -382,9 +382,10 @@ static void arcdev_setup(struct net_device *dev) dev->flags = IFF_BROADCAST; } -static void arcnet_timer(unsigned long data) +static void arcnet_timer(struct timer_list *t) { - struct net_device *dev = (struct net_device *)data; + struct arcnet_local *lp = from_timer(lp, t, timer); + struct net_device *dev = lp->dev; if (!netif_carrier_ok(dev)) { netif_carrier_on(dev);
@@ -450,7 +451,7 @@ struct net_device *alloc_arcdev(const char *name) lp->dev = dev; spin_lock_init(&lp->lock); - setup_timer(&lp->timer, arcnet_timer, (unsigned long)dev); + timer_setup(&lp->timer, arcnet_timer, 0); } return dev;
--
2.7.4
--
Kees Cook
Pixel Security