From: Allen Pais Date: Thu, 21 Sep 2017 17:04:48 +0000 (+0530) Subject: drivers: net: atmel: use setup_timer() helper. X-Git-Tag: v4.15-rc1~84^2~675^2~37 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=55d3cef4ee68d7d54c457c7deeb0e393dd386fdc;p=thirdparty%2Fkernel%2Flinux.git 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 Signed-off-by: David S. Miller --- diff --git a/drivers/net/wireless/atmel/atmel.c b/drivers/net/wireless/atmel/atmel.c index b68436b23a636..e816d53c2c051 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;