Skip to content

Commit

Permalink
net: mv643xx_eth: Use setup_timer
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Vaishali Thakkar authored and David S. Miller committed Jun 1, 2015
1 parent d803731 commit 12d5e6f
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions drivers/net/ethernet/marvell/mv643xx_eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down

0 comments on commit 12d5e6f

Please sign in to comment.