summaryrefslogtreecommitdiff
path: root/drivers/net/arcnet
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-10-25 13:54:06 +0300
committerDavid S. Miller <davem@davemloft.net>2017-10-27 06:09:16 +0300
commitc58320de5194b57858b829b8f204ca6bc1e38e10 (patch)
treeca0c2edc26133277b8873d65bda718acc0e5c701 /drivers/net/arcnet
parent032cfd66afcc2dd2c7be89c71b020fcb15bcc37d (diff)
downloadlinux-c58320de5194b57858b829b8f204ca6bc1e38e10.tar.xz
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>
Diffstat (limited to 'drivers/net/arcnet')
-rw-r--r--drivers/net/arcnet/arcnet.c7
1 files 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;