Skip to content

Commit

Permalink
net: sxgbe: Use setup_timer
Browse files Browse the repository at this point in the history
Convert a call to init_timer and accompanying intializations of
the timer's data and function fields to a call to setup_timer.

A simplified version of the semantic match that fixes this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@
expression t,f,d;
@@

-init_timer(&t);
+setup_timer(&t,f,d);
-t.function = f;
-t.data = d;
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Julia Lawall authored and David S. Miller committed Dec 30, 2014
1 parent fea3cb0 commit 1214133
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,8 @@ bool sxgbe_eee_init(struct sxgbe_priv_data * const priv)
return false;

priv->eee_active = 1;
init_timer(&priv->eee_ctrl_timer);
priv->eee_ctrl_timer.function = sxgbe_eee_ctrl_timer;
priv->eee_ctrl_timer.data = (unsigned long)priv;
setup_timer(&priv->eee_ctrl_timer, sxgbe_eee_ctrl_timer,
(unsigned long)priv);
priv->eee_ctrl_timer.expires = SXGBE_LPI_TIMER(eee_timer);
add_timer(&priv->eee_ctrl_timer);

Expand Down Expand Up @@ -1009,10 +1008,9 @@ static void sxgbe_tx_init_coalesce(struct sxgbe_priv_data *priv)
struct sxgbe_tx_queue *p = priv->txq[queue_num];
p->tx_coal_frames = SXGBE_TX_FRAMES;
p->tx_coal_timer = SXGBE_COAL_TX_TIMER;
init_timer(&p->txtimer);
setup_timer(&p->txtimer, sxgbe_tx_timer,
(unsigned long)&priv->txq[queue_num]);
p->txtimer.expires = SXGBE_COAL_TIMER(p->tx_coal_timer);
p->txtimer.data = (unsigned long)&priv->txq[queue_num];
p->txtimer.function = sxgbe_tx_timer;
add_timer(&p->txtimer);
}
}
Expand Down

0 comments on commit 1214133

Please sign in to comment.