net: mv643xx_eth: Use setup_timer

Use the timer API function setup_timer instead of structure field
assignments to initialize a timer.

A simplified version of the Coccinelle semantic patch that performs
this transformation is as follows:

@change@
expression e, func, da;
@@

-init_timer (&e);
+setup_timer (&e, func, da);
-e.data = da;
-e.function = func;

Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 1c75829eb1668fe094af3a9049fb53bb0c8b4bb5..d52639bc491f7a1aa76f8bd127df8b9e68be0332 100644 (file)
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -3125,9 +3125,8 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
 
        mib_counters_clear(mp);
 
-       init_timer(&mp->mib_counters_timer);
-       mp->mib_counters_timer.data = (unsigned long)mp;
-       mp->mib_counters_timer.function = mib_counters_timer_wrapper;
+       setup_timer(&mp->mib_counters_timer, mib_counters_timer_wrapper,
+                   (unsigned long)mp);
        mp->mib_counters_timer.expires = jiffies + 30 * HZ;
 
        spin_lock_init(&mp->mib_counters_lock);
@@ -3136,9 +3135,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
 
        netif_napi_add(dev, &mp->napi, mv643xx_eth_poll, NAPI_POLL_WEIGHT);
 
-       init_timer(&mp->rx_oom);
-       mp->rx_oom.data = (unsigned long)mp;
-       mp->rx_oom.function = oom_timer_wrapper;
+       setup_timer(&mp->rx_oom, oom_timer_wrapper, (unsigned long)mp);
 
 
        res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);