diff options
| author |   Kees Cook <keescook@chromium.org> | 2017-10-16 16:16:58 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-17 12:14:43 +0200 |
| commit | 66a4550308b8391fecd46c7e733cbccb3e01ee96 (patch) | |
| tree | b1398bd5763fc4e70c6bfde5762e3983253386e0 /drivers/usb/host/xhci-mem.c | |
| parent | usb: typec: wcove: fix uninitialized usbc_irq1 and usbc_irq2 (diff) | |
| download | wireguard-linux-66a4550308b8391fecd46c7e733cbccb3e01ee96.tar.xz wireguard-linux-66a4550308b8391fecd46c7e733cbccb3e01ee96.zip | |
xhci: 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: Mathias Nyman <mathias.nyman@intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/xhci-mem.c')
| -rw-r--r-- | drivers/usb/host/xhci-mem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index b81a2317420b..795219a397d3 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -800,8 +800,8 @@ void xhci_free_stream_info(struct xhci_hcd *xhci, static void xhci_init_endpoint_timer(struct xhci_hcd *xhci, struct xhci_virt_ep *ep) { - setup_timer(&ep->stop_cmd_timer, xhci_stop_endpoint_command_watchdog, - (unsigned long)ep); + timer_setup(&ep->stop_cmd_timer, xhci_stop_endpoint_command_watchdog, + 0); ep->xhci = xhci; } |