p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drivers/net: arcnet: Convert timers to use timer_setup() 

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 <m.grzeschik@pengutronix.de>
Cc: netdev@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Kees Cook 2017-10-25 03:54:06 -07:00 committed by David S. Miller
parent 032cfd66af
commit c58320de51
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/arcnet/arcnet.c
View File

@ -382,9 +382,10 @@ static void arcdev_setup(struct net_device *dev)
dev->flags = IFF_BROADCAST; 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)) { if (!netif_carrier_ok(dev)) {
netif_carrier_on(dev); netif_carrier_on(dev);
@ -450,7 +451,7 @@ struct net_device *alloc_arcdev(const char *name)
lp->dev = dev; lp->dev = dev;
spin_lock_init(&lp->lock); spin_lock_init(&lp->lock);
setup_timer(&lp->timer, arcnet_timer, (unsigned long)dev); timer_setup(&lp->timer, arcnet_timer, 0);
} }
return dev; return dev;