OSDN Git Service

usb: sl811-hcd: Use setup_timer
authorJulia Lawall <Julia.Lawall@lip6.fr>
Fri, 26 Dec 2014 14:35:52 +0000 (15:35 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 9 Jan 2015 20:17:24 +0000 (12:17 -0800)
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>
drivers/usb/host/sl811-hcd.c

index 25fb1da..cef3140 100644 (file)
@@ -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;