summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/orinoco
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2014-12-26 15:35:55 +0100
committerKalle Valo <kvalo@codeaurora.org>2015-01-07 10:45:12 +0200
commit99a1b74395a51b5be91a92c23da47c0032ff7507 (patch)
treeb786d8db574a9b321cbfcf03f6cf8d584264aa1e /drivers/net/wireless/orinoco
parent1a94ace406ad6befab73ac62f254c39599617c90 (diff)
downloadlinux-stable-99a1b74395a51b5be91a92c23da47c0032ff7507.tar.gz
linux-stable-99a1b74395a51b5be91a92c23da47c0032ff7507.tar.bz2
linux-stable-99a1b74395a51b5be91a92c23da47c0032ff7507.zip
orinoco_usb: 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: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/orinoco')
-rw-r--r--drivers/net/wireless/orinoco/orinoco_usb.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c
index 995846422dc0..91f05442de28 100644
--- a/drivers/net/wireless/orinoco/orinoco_usb.c
+++ b/drivers/net/wireless/orinoco/orinoco_usb.c
@@ -364,9 +364,7 @@ static struct request_context *ezusb_alloc_ctx(struct ezusb_priv *upriv,
atomic_set(&ctx->refcount, 1);
init_completion(&ctx->done);
- init_timer(&ctx->timer);
- ctx->timer.function = ezusb_request_timerfn;
- ctx->timer.data = (u_long) ctx;
+ setup_timer(&ctx->timer, ezusb_request_timerfn, (u_long)ctx);
return ctx;
}