OSDN Git Service

drivers: net: atmel: use setup_timer() helper.
authorAllen Pais <allen.lkml@gmail.com>
Thu, 21 Sep 2017 17:04:48 +0000 (22:34 +0530)
committerDavid S. Miller <davem@davemloft.net>
Thu, 21 Sep 2017 18:44:41 +0000 (11:44 -0700)
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>
drivers/net/wireless/atmel/atmel.c

index b68436b..e816d53 100644 (file)
@@ -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;