From 05678497276e1ff9394f7f815d80b1f2d47e92f4 Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Tue, 24 Oct 2017 03:08:35 -0700 Subject: usb: musb: 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. Instead of a per-device static timer variable, a spare timer "dev_timer" is added to the musb structure for devices to use for their per-device timer. Cc: linux-usb@vger.kernel.org Signed-off-by: Kees Cook Acked-by: Bin Liu Signed-off-by: Greg Kroah-Hartman --- drivers/usb/musb/blackfin.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'drivers/usb/musb/blackfin.h') diff --git a/drivers/usb/musb/blackfin.h b/drivers/usb/musb/blackfin.h index c84dae546dc6..231f2d23b8a1 100644 --- a/drivers/usb/musb/blackfin.h +++ b/drivers/usb/musb/blackfin.h @@ -82,6 +82,4 @@ static void dump_fifo_data(u8 *buf, u16 len) /* Almost 1 second */ #define TIMER_DELAY (1 * HZ) -static struct timer_list musb_conn_timer; - #endif /* __MUSB_BLACKFIN_H__ */ -- cgit v1.2.3