OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usb: isp1301-omap: 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: linux-usb@vger.kernel.org
Cc: linux-omap@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kees Cook 2017-10-16 16:29:23 -07:00 committed by Greg Kroah-Hartman
parent e4ed2b5370
commit 4c13fec1ba
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/usb/phy/phy-isp1301-omap.c
View File

@ -1183,9 +1183,11 @@ static irqreturn_t isp1301_irq(int irq, void *isp)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static void isp1301_timer(unsigned long _isp) static void isp1301_timer(struct timer_list *t)
{ {
isp1301_defer_work((void *)_isp, WORK_TIMER); struct isp1301 *isp = from_timer(isp, t, timer);
isp1301_defer_work(isp, WORK_TIMER);
} }
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
@ -1506,7 +1508,7 @@ isp1301_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
} }
INIT_WORK(&isp->work, isp1301_work); INIT_WORK(&isp->work, isp1301_work);
setup_timer(&isp->timer, isp1301_timer, (unsigned long)isp); timer_setup(&isp->timer, isp1301_timer, 0);
i2c_set_clientdata(i2c, isp); i2c_set_clientdata(i2c, isp);
isp->client = i2c; isp->client = i2c;