hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usb: usbip: Convert timers to use timer_setup() 

In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: Valentina Manea <valentina.manea.m@gmail.com>
Cc: Shuah Khan <shuah@kernel.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kees Cook 2017-10-24 03:09:05 -07:00 committed by Greg Kroah-Hartman
parent 32bf9fd50f
commit 09e005c44c
1 changed files with 3 additions and 3 deletions
drivers/usb/usbip
vudc_transfer.c

6
drivers/usb/usbip/vudc_transfer.c
View File

@ -311,9 +311,9 @@ top:
return sent;
}
static void v_timer(unsigned long _vudc)
static void v_timer(struct timer_list *t)
{
struct vudc *udc = (struct vudc *) _vudc;
struct vudc *udc = from_timer(udc, t, tr_timer.timer);
struct transfer_timer *timer = &udc->tr_timer;
struct urbp *urb_p, *tmp;
unsigned long flags;
@ -459,7 +459,7 @@ void v_init_timer(struct vudc *udc)
{
struct transfer_timer *t = &udc->tr_timer;
setup_timer(&t->timer, v_timer, (unsigned long) udc);
timer_setup(&t->timer, v_timer, 0);
t->state = VUDC_TR_STOPPED;
}