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>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
707a123d7a
commit
66a4550308
@@ -947,15 +947,12 @@ void xhci_hc_died(struct xhci_hcd *xhci)
|
||||
* Instead we use a combination of that flag and checking if a new timer is
|
||||
* pending.
|
||||
*/
|
||||
void xhci_stop_endpoint_command_watchdog(unsigned long arg)
|
||||
void xhci_stop_endpoint_command_watchdog(struct timer_list *t)
|
||||
{
|
||||
struct xhci_hcd *xhci;
|
||||
struct xhci_virt_ep *ep;
|
||||
struct xhci_virt_ep *ep = from_timer(ep, t, stop_cmd_timer);
|
||||
struct xhci_hcd *xhci = ep->xhci;
|
||||
unsigned long flags;
|
||||
|
||||
ep = (struct xhci_virt_ep *) arg;
|
||||
xhci = ep->xhci;
|
||||
|
||||
spin_lock_irqsave(&xhci->lock, flags);
|
||||
|
||||
/* bail out if cmd completed but raced with stop ep watchdog timer.*/
|
||||
|
Reference in New Issue
Block a user