aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/atmel/atmel.c
diff options
context:
space:
mode:
authorAllen Pais <allen.lkml@gmail.com>2017-09-21 22:34:48 +0530
committerDavid S. Miller <davem@davemloft.net>2017-09-21 11:44:41 -0700
commit55d3cef4ee68d7d54c457c7deeb0e393dd386fdc (patch)
treed2f034bce51091271f07a2d74841799fce37cfe2 /drivers/net/wireless/atmel/atmel.c
parentdrivers: net: xen-netback: use setup_timer() helper. (diff)
downloadlinux-dev-55d3cef4ee68d7d54c457c7deeb0e393dd386fdc.tar.xz
linux-dev-55d3cef4ee68d7d54c457c7deeb0e393dd386fdc.zip
drivers: net: atmel: 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>
Diffstat (limited to 'drivers/net/wireless/atmel/atmel.c')
-rw-r--r--drivers/net/wireless/atmel/atmel.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/atmel/atmel.c b/drivers/net/wireless/atmel/atmel.c
index b68436b23a63..e816d53c2c05 100644
--- a/drivers/net/wireless/atmel/atmel.c
+++ b/drivers/net/wireless/atmel/atmel.c
@@ -1579,11 +1579,10 @@ struct net_device *init_atmel_card(unsigned short irq, unsigned long port,
priv->default_beacon_period = priv->beacon_period = 100;
priv->listen_interval = 1;
- init_timer(&priv->management_timer);
+ setup_timer(&priv->management_timer, atmel_management_timer,
+ (unsigned long)dev);
spin_lock_init(&priv->irqlock);
spin_lock_init(&priv->timerlock);
- priv->management_timer.function = atmel_management_timer;
- priv->management_timer.data = (unsigned long) dev;
dev->netdev_ops = &atmel_netdev_ops;
dev->wireless_handlers = &atmel_handler_def;