summaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb/blackfin.h
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-10-24 12:08:35 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-11-01 16:48:10 +0100
commit05678497276e1ff9394f7f815d80b1f2d47e92f4 (patch)
treebdcf8b49cacaf68fd4609662226755dba98c410c /drivers/usb/musb/blackfin.h
parentusb: musb_core: mark expected switch fall-through (diff)
downloadlinux-05678497276e1ff9394f7f815d80b1f2d47e92f4.tar.xz
linux-05678497276e1ff9394f7f815d80b1f2d47e92f4.zip
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 <keescook@chromium.org> Acked-by: Bin Liu <b-liu@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/musb/blackfin.h')
-rw-r--r--drivers/usb/musb/blackfin.h2
1 files changed, 0 insertions, 2 deletions
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__ */