usb: isp1301-omap: Convert timers to use timer_setup()

Commit Message

Kees Cook Oct. 16, 2017, 11:29 p.m. UTC

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: Felipe Balbi <[e-mail]>
Cc: Greg Kroah-Hartman <[e-mail]>
Cc: [e-mail]
Cc: [e-mail]
Signed-off-by: Kees Cook <[e-mail]>
Acked-by: Tony Lindgren <[e-mail]>
---
 drivers/usb/phy/phy-isp1301-omap.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Comments

Felipe Balbi Oct. 17, 2017, 8:09 a.m. UTC | #1

Hi,

Kees Cook <[e-mail]> writes:
> 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: Felipe Balbi <[e-mail]>
> Cc: Greg Kroah-Hartman <[e-mail]>
> Cc: [e-mail]
> Cc: [e-mail]
> Signed-off-by: Kees Cook <[e-mail]>
> Acked-by: Tony Lindgren <[e-mail]>

do you want me to take this through my tree?

If you wanna take through yours, here's my ack:

Acked-by: Felipe Balbi <[e-mail]>

Greg KH Oct. 17, 2017, 8:52 a.m. UTC | #2

On Tue, Oct 17, 2017 at 11:09:56AM +0300, Felipe Balbi wrote:
> 
> Hi,
> 
> Kees Cook <[e-mail]> writes:
> > 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: Felipe Balbi <[e-mail]>
> > Cc: Greg Kroah-Hartman <[e-mail]>
> > Cc: [e-mail]
> > Cc: [e-mail]
> > Signed-off-by: Kees Cook <[e-mail]>
> > Acked-by: Tony Lindgren <[e-mail]>
> 
> do you want me to take this through my tree?
> 
> If you wanna take through yours, here's my ack:
> 
> Acked-by: Felipe Balbi <[e-mail]>

I'll just take it through mine, thanks :)

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Felipe Balbi Oct. 17, 2017, 9:42 a.m. UTC | #3

Hi,

Greg Kroah-Hartman <[e-mail]> writes:
>> Kees Cook <[e-mail]> writes:
>> > 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: Felipe Balbi <[e-mail]>
>> > Cc: Greg Kroah-Hartman <[e-mail]>
>> > Cc: [e-mail]
>> > Cc: [e-mail]
>> > Signed-off-by: Kees Cook <[e-mail]>
>> > Acked-by: Tony Lindgren <[e-mail]>
>> 
>> do you want me to take this through my tree?
>> 
>> If you wanna take through yours, here's my ack:
>> 
>> Acked-by: Felipe Balbi <[e-mail]>
>
> I'll just take it through mine, thanks :)

thanks for confirming. Dropped from my queue.

Patch

diff --git a/drivers/usb/phy/phy-isp1301-omap.c b/drivers/usb/phy/phy-isp1301-omap.c
index 8a07ce63b92d..00bcc6c6db17 100644
--- a/drivers/usb/phy/phy-isp1301-omap.c
+++ b/drivers/usb/phy/phy-isp1301-omap.c
@@ -1183,9 +1183,11 @@  static irqreturn_t isp1301_irq(int irq, void *isp)
 	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);
-	setup_timer(&isp->timer, isp1301_timer, (unsigned long)isp);
+	timer_setup(&isp->timer, isp1301_timer, 0);
 
 	i2c_set_clientdata(i2c, isp);
 	isp->client = i2c;