[3.16.y-ckt stable] Patch "xhci-mem: Use setup_timer" has been added to staging queue

[Julia Lawall]

On Mon, 26 Oct 2015, Kamal Mostafa wrote:

> This is a note to let you know that I have just added a patch titled
> 
>     xhci-mem: Use setup_timer
> 
> to the linux-3.16.y-queue branch of the 3.16.y-ckt extended stable tree 
> which can be found at:
> 
>     http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.16.y-queue
> 
> This patch is scheduled to be released in version 3.19.8-ckt9.
> 
> If you, or anyone else, feels it should not be added to this tree, please 
> reply to this email.
> 
> For more information about the 3.16.y-ckt tree, see
> https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

I'm not sure why this patch is going in a stable kernel.  It doesn't fix 
any bug.

julia

> Thanks.
> -Kamal
> 
> ------
> 
> From ca8fd29485dc677d61e2caa2e45c78f55b1e1364 Mon Sep 17 00:00:00 2001
> From: Julia Lawall <Julia.Lawall at lip6.fr>
> Date: Fri, 9 Jan 2015 16:06:30 +0200
> Subject: xhci-mem: Use setup_timer
> 
> commit 9e08a03dc12a41ce695559f8c6d999aaf245b8be upstream.
> 
> Convert a call to init_timer and accompanying intializations of
> the timer's data and function fields to a call to setup_timer.
> 
> A simplified version of the semantic match that fixes this problem is as
> follows: (http://coccinelle.lip6.fr/)
> 
> // <smpl>
> @@
> expression t,f,d;
> @@
> 
> -init_timer(&t);
> +setup_timer(&t,f,d);
> -t.data = d;
> -t.function = f;
> // </smpl>
> 
> Signed-off-by: Julia Lawall <Julia.Lawall at lip6.fr>
> Signed-off-by: Mathias Nyman <mathias.nyman at linux.intel.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> Signed-off-by: Kamal Mostafa <kamal at canonical.com>
> ---
>  drivers/usb/host/xhci-mem.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
> index 79a3c5f..1291417e3 100644
> --- a/drivers/usb/host/xhci-mem.c
> +++ b/drivers/usb/host/xhci-mem.c
> @@ -833,9 +833,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)
>  {
> -	init_timer(&ep->stop_cmd_timer);
> -	ep->stop_cmd_timer.data = (unsigned long) ep;
> -	ep->stop_cmd_timer.function = xhci_stop_endpoint_command_watchdog;
> +	setup_timer(&ep->stop_cmd_timer, xhci_stop_endpoint_command_watchdog,
> +		    (unsigned long)ep);
>  	ep->xhci = xhci;
>  }
> 
> @@ -2510,9 +2509,8 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
>  	xhci_print_ir_set(xhci, 0);
> 
>  	/* init command timeout timer */
> -	init_timer(&xhci->cmd_timer);
> -	xhci->cmd_timer.data = (unsigned long) xhci;
> -	xhci->cmd_timer.function = xhci_handle_command_timeout;
> +	setup_timer(&xhci->cmd_timer, xhci_handle_command_timeout,
> +		    (unsigned long)xhci);
> 
>  	/*
>  	 * XXX: Might need to set the Interrupter Moderation Register to
> --
> 1.9.1
> 
>