summaryrefslogtreecommitdiffstats
path: root/drivers/usb/atm/cxacru.c
diff options
context:
space:
mode:
authorAllen Pais <allen.lkml@gmail.com>2017-09-22 10:59:39 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-10-04 09:59:29 +0200
commit6a29d4b944316f7e4ad643b78141b60fdf41c5ca (patch)
treed90cbbac3a42c7bf79f5ea1b47ae9dc7f05e70fc /drivers/usb/atm/cxacru.c
parentusb: gadget: udc: pxa25x_udc: use setup_timer() helper. (diff)
downloadlinux-6a29d4b944316f7e4ad643b78141b60fdf41c5ca.tar.xz
linux-6a29d4b944316f7e4ad643b78141b60fdf41c5ca.zip
drivers: usb: atm: cxacru: use setup_timer() helper.
Use setup_timer function instead of initializing timer with the function and data fields. Signed-off-by: Allen Pais <allen.lkml@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/atm/cxacru.c')
-rw-r--r--drivers/usb/atm/cxacru.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
index 5160a4a966b3..600a670b4feb 100644
--- a/drivers/usb/atm/cxacru.c
+++ b/drivers/usb/atm/cxacru.c
@@ -570,10 +570,8 @@ static int cxacru_start_wait_urb(struct urb *urb, struct completion *done,
{
struct timer_list timer;
- init_timer(&timer);
+ setup_timer(&timer, cxacru_timeout_kill, (unsigned long)urb);
timer.expires = jiffies + msecs_to_jiffies(CMD_TIMEOUT);
- timer.data = (unsigned long) urb;
- timer.function = cxacru_timeout_kill;
add_timer(&timer);
wait_for_completion(done);
del_timer_sync(&timer);