summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/sl811-hcd.c
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2014-12-26 15:35:52 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-01-09 12:17:24 -0800
commitb4ab5e85d6e7d902a4efbfaf96abc889b335b10a (patch)
tree2e192f5f37cf9bc38e429e34b7e05c6d08373c2e /drivers/usb/host/sl811-hcd.c
parent25821b4a7a39d3ae5757762076367827a5f1145c (diff)
downloadblackbird-op-linux-b4ab5e85d6e7d902a4efbfaf96abc889b335b10a.tar.gz
blackbird-op-linux-b4ab5e85d6e7d902a4efbfaf96abc889b335b10a.zip
usb: sl811-hcd: 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/sl811-hcd.c')
-rw-r--r--drivers/usb/host/sl811-hcd.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 25fb1da8d3d7..cef3140ffd8a 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -1691,9 +1691,7 @@ sl811h_probe(struct platform_device *dev)
spin_lock_init(&sl811->lock);
INIT_LIST_HEAD(&sl811->async);
sl811->board = dev_get_platdata(&dev->dev);
- init_timer(&sl811->timer);
- sl811->timer.function = sl811h_timer;
- sl811->timer.data = (unsigned long) sl811;
+ setup_timer(&sl811->timer, sl811h_timer, (unsigned long)sl811);
sl811->addr_reg = addr_reg;
sl811->data_reg = data_reg;
OpenPOWER on IntegriCloud