summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulia Lawall <julia.lawall@lip6.fr>2014-12-26 15:35:42 +0100
committerDavid S. Miller <davem@davemloft.net>2014-12-30 18:34:23 -0500
commitfea3cb063bf9b9d6b4efd5c973217a708812f5e2 (patch)
tree9f52024a80d1d5ef7186f514bdcbad2fcd6cb5d9
parentcc73e41f17be97eb4e387610bd95e952127e3216 (diff)
ksz884x: Use setup_timer
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>
-rw-r--r--drivers/net/ethernet/micrel/ksz884x.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
index 2fa6ae026e4f..10988fbf47eb 100644
--- a/drivers/net/ethernet/micrel/ksz884x.c
+++ b/drivers/net/ethernet/micrel/ksz884x.c
@@ -4342,9 +4342,7 @@ static void ksz_init_timer(struct ksz_timer_info *info, int period,
{
info->max = 0;
info->period = period;
- init_timer(&info->timer);
- info->timer.function = function;
- info->timer.data = (unsigned long) data;
+ setup_timer(&info->timer, function, (unsigned long)data);
}
static void ksz_update_timer(struct ksz_timer_info *info)