* [PATCH] usb: isp1301-omap: Convert timers to use timer_setup()
@ 2017-10-16 23:29 Kees Cook
2017-10-17 8:09 ` Felipe Balbi
0 siblings, 1 reply; 6+ messages in thread
From: Kees Cook @ 2017-10-16 23:29 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: Felipe Balbi, linux-usb, linux-omap, linux-kernel
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 <balbi@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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>
---
drivers/usb/phy/phy-isp1301-omap.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
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;
--
2.7.4
--
Kees Cook
Pixel Security
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] usb: isp1301-omap: Convert timers to use timer_setup()
2017-10-16 23:29 [PATCH] usb: isp1301-omap: Convert timers to use timer_setup() Kees Cook
@ 2017-10-17 8:09 ` Felipe Balbi
2017-10-17 8:52 ` Greg Kroah-Hartman
0 siblings, 1 reply; 6+ messages in thread
From: Felipe Balbi @ 2017-10-17 8:09 UTC (permalink / raw)
To: Kees Cook, Greg Kroah-Hartman; +Cc: linux-usb, linux-omap, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 683 bytes --]
Hi,
Kees Cook <keescook@chromium.org> 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 <balbi@kernel.org>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> 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>
do you want me to take this through my tree?
If you wanna take through yours, here's my ack:
Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com>
--
balbi
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] usb: isp1301-omap: Convert timers to use timer_setup()
2017-10-17 8:09 ` Felipe Balbi
@ 2017-10-17 8:52 ` Greg Kroah-Hartman
2017-10-17 9:42 ` Felipe Balbi
0 siblings, 1 reply; 6+ messages in thread
From: Greg Kroah-Hartman @ 2017-10-17 8:52 UTC (permalink / raw)
To: Felipe Balbi; +Cc: Kees Cook, linux-usb, linux-omap, linux-kernel
On Tue, Oct 17, 2017 at 11:09:56AM +0300, Felipe Balbi wrote:
>
> Hi,
>
> Kees Cook <keescook@chromium.org> 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 <balbi@kernel.org>
> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > 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>
>
> do you want me to take this through my tree?
>
> If you wanna take through yours, here's my ack:
>
> Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com>
I'll just take it through mine, thanks :)
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] usb: isp1301-omap: Convert timers to use timer_setup()
2017-10-17 8:52 ` Greg Kroah-Hartman
@ 2017-10-17 9:42 ` Felipe Balbi
0 siblings, 0 replies; 6+ messages in thread
From: Felipe Balbi @ 2017-10-17 9:42 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: Kees Cook, linux-usb, linux-omap, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 888 bytes --]
Hi,
Greg Kroah-Hartman <gregkh@linuxfoundation.org> writes:
>> Kees Cook <keescook@chromium.org> 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 <balbi@kernel.org>
>> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>> > 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>
>>
>> do you want me to take this through my tree?
>>
>> If you wanna take through yours, here's my ack:
>>
>> Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com>
>
> I'll just take it through mine, thanks :)
thanks for confirming. Dropped from my queue.
--
balbi
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] usb: isp1301-omap: Convert timers to use timer_setup()
@ 2017-10-05 0:53 Kees Cook
2017-10-05 19:27 ` Tony Lindgren
0 siblings, 1 reply; 6+ messages in thread
From: Kees Cook @ 2017-10-05 0:53 UTC (permalink / raw)
To: linux-kernel
Cc: Felipe Balbi, Greg Kroah-Hartman, linux-usb, linux-omap,
Thomas Gleixner
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 <balbi@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org
Cc: linux-omap@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Kees Cook <keescook@chromium.org>
---
This requires commit 686fef928bba ("timer: Prepare to change timer
callback argument type") in v4.14-rc3, but should be otherwise
stand-alone.
---
drivers/usb/phy/phy-isp1301-omap.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/phy/phy-isp1301-omap.c b/drivers/usb/phy/phy-isp1301-omap.c
index c6052c814bcc..43866e0f9217 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);
}
/*-------------------------------------------------------------------------*/
@@ -1507,9 +1509,7 @@ isp1301_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
}
INIT_WORK(&isp->work, isp1301_work);
- init_timer(&isp->timer);
- isp->timer.function = isp1301_timer;
- isp->timer.data = (unsigned long) isp;
+ timer_setup(&isp->timer, isp1301_timer, 0);
i2c_set_clientdata(i2c, isp);
isp->client = i2c;
--
2.7.4
--
Kees Cook
Pixel Security
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] usb: isp1301-omap: Convert timers to use timer_setup()
2017-10-05 0:53 Kees Cook
@ 2017-10-05 19:27 ` Tony Lindgren
0 siblings, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2017-10-05 19:27 UTC (permalink / raw)
To: Kees Cook
Cc: linux-kernel, Felipe Balbi, Greg Kroah-Hartman, linux-usb,
linux-omap, Thomas Gleixner
* Kees Cook <keescook@chromium.org> [171004 17:57]:
> 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 <balbi@kernel.org>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: linux-usb@vger.kernel.org
> Cc: linux-omap@vger.kernel.org
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
> This requires commit 686fef928bba ("timer: Prepare to change timer
> callback argument type") in v4.14-rc3, but should be otherwise
> stand-alone.
Acked-by: Tony Lindgren <tony@atomide.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-10-17 9:42 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-16 23:29 [PATCH] usb: isp1301-omap: Convert timers to use timer_setup() Kees Cook
2017-10-17 8:09 ` Felipe Balbi
2017-10-17 8:52 ` Greg Kroah-Hartman
2017-10-17 9:42 ` Felipe Balbi
-- strict thread matches above, loose matches on Subject: below --
2017-10-05 0:53 Kees Cook
2017-10-05 19:27 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).