usb: isp1760: 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: "Gustavo A. R. Silva" <garsilva@embeddedor.com> Cc: Bhumika Goyal <bhumirks@gmail.com> 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
09e005c44c
commit
7e33da59a6
@@ -1331,9 +1331,9 @@ static irqreturn_t isp1760_udc_irq(int irq, void *dev)
|
||||
return status ? IRQ_HANDLED : IRQ_NONE;
|
||||
}
|
||||
|
||||
static void isp1760_udc_vbus_poll(unsigned long data)
|
||||
static void isp1760_udc_vbus_poll(struct timer_list *t)
|
||||
{
|
||||
struct isp1760_udc *udc = (struct isp1760_udc *)data;
|
||||
struct isp1760_udc *udc = from_timer(udc, t, vbus_timer);
|
||||
unsigned long flags;
|
||||
|
||||
spin_lock_irqsave(&udc->lock, flags);
|
||||
@@ -1452,8 +1452,7 @@ int isp1760_udc_register(struct isp1760_device *isp, int irq,
|
||||
udc->regs = isp->regs;
|
||||
|
||||
spin_lock_init(&udc->lock);
|
||||
setup_timer(&udc->vbus_timer, isp1760_udc_vbus_poll,
|
||||
(unsigned long)udc);
|
||||
timer_setup(&udc->vbus_timer, isp1760_udc_vbus_poll, 0);
|
||||
|
||||
ret = isp1760_udc_init(udc);
|
||||
if (ret < 0)
|
||||
|
Reference in New Issue
Block a user