Commit 29bce577 authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman

usb/gadget/snps_udc_core: 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.

If the probe fails, udc_remove() will not be called, so there is no
reason to make del_timer_sync() calls conditional. As a result, use of
the .data field can be dropped, in support of making removing this field
entirely from struct timer_list.

Cc: Felipe Balbi <balbi@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Raviteja Garimella <raviteja.garimella@broadcom.com>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: "Gustavo A. R. Silva" <garsilva@embeddedor.com>
Cc: linux-usb@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 66a45503
...@@ -1733,7 +1733,7 @@ static void udc_soft_reset(struct udc *dev) ...@@ -1733,7 +1733,7 @@ static void udc_soft_reset(struct udc *dev)
} }
/* RDE timer callback to set RDE bit */ /* RDE timer callback to set RDE bit */
static void udc_timer_function(unsigned long v) static void udc_timer_function(struct timer_list *unused)
{ {
u32 tmp; u32 tmp;
...@@ -1813,7 +1813,7 @@ static void udc_handle_halt_state(struct udc_ep *ep) ...@@ -1813,7 +1813,7 @@ static void udc_handle_halt_state(struct udc_ep *ep)
} }
/* Stall timer callback to poll S bit and set it again after */ /* Stall timer callback to poll S bit and set it again after */
static void udc_pollstall_timer_function(unsigned long v) static void udc_pollstall_timer_function(struct timer_list *unused)
{ {
struct udc_ep *ep; struct udc_ep *ep;
int halted = 0; int halted = 0;
...@@ -3067,14 +3067,12 @@ void udc_remove(struct udc *dev) ...@@ -3067,14 +3067,12 @@ void udc_remove(struct udc *dev)
stop_timer++; stop_timer++;
if (timer_pending(&udc_timer)) if (timer_pending(&udc_timer))
wait_for_completion(&on_exit); wait_for_completion(&on_exit);
if (udc_timer.data) del_timer_sync(&udc_timer);
del_timer_sync(&udc_timer);
/* remove pollstall timer */ /* remove pollstall timer */
stop_pollstall_timer++; stop_pollstall_timer++;
if (timer_pending(&udc_pollstall_timer)) if (timer_pending(&udc_pollstall_timer))
wait_for_completion(&on_pollstall_exit); wait_for_completion(&on_pollstall_exit);
if (udc_pollstall_timer.data) del_timer_sync(&udc_pollstall_timer);
del_timer_sync(&udc_pollstall_timer);
udc = NULL; udc = NULL;
} }
EXPORT_SYMBOL_GPL(udc_remove); EXPORT_SYMBOL_GPL(udc_remove);
...@@ -3164,10 +3162,6 @@ int udc_probe(struct udc *dev) ...@@ -3164,10 +3162,6 @@ int udc_probe(struct udc *dev)
u32 reg; u32 reg;
int retval; int retval;
/* mark timer as not initialized */
udc_timer.data = 0;
udc_pollstall_timer.data = 0;
/* device struct setup */ /* device struct setup */
dev->gadget.ops = &udc_ops; dev->gadget.ops = &udc_ops;
...@@ -3207,9 +3201,8 @@ int udc_probe(struct udc *dev) ...@@ -3207,9 +3201,8 @@ int udc_probe(struct udc *dev)
goto finished; goto finished;
/* timer init */ /* timer init */
setup_timer(&udc_timer, udc_timer_function, 1); timer_setup(&udc_timer, udc_timer_function, 0);
/* timer pollstall init */ timer_setup(&udc_pollstall_timer, udc_pollstall_timer_function, 0);
setup_timer(&udc_pollstall_timer, udc_pollstall_timer_function, 1);
/* set SD */ /* set SD */
reg = readl(&dev->regs->ctl); reg = readl(&dev->regs->ctl);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment