linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] staging: most: hdm-usb: Use setup_timer
@ 2015-10-24  2:15 Muhammad Falak R Wani
  2015-10-28 10:21 ` Christian Gromm
  0 siblings, 1 reply; 2+ messages in thread
From: Muhammad Falak R Wani @ 2015-10-24  2:15 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Christian Gromm, Andrey Shvetsov,
	Sudip Mukherjee, Masanari Iida, Adrian Remonda, devel,
	linux-kernel
  Cc: Muhammad Falak R Wani

Use the timer API function setup_timer instead of init_timer, removing
the structure field assignments.

<smpl>

@timer@
expression e1,e2,e3,fn_ptr;
@@
-init_timer(&e1);
+setup_timer(&e1, fn_ptr, e2);
... when != fn_ptr = e3
-e1.function = fn_ptr;
-e1.data = e2;

</smpl>

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
---
 drivers/staging/most/hdm-usb/hdm_usb.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/most/hdm-usb/hdm_usb.c b/drivers/staging/most/hdm-usb/hdm_usb.c
index 0bf38c4..2e07313 100644
--- a/drivers/staging/most/hdm-usb/hdm_usb.c
+++ b/drivers/staging/most/hdm-usb/hdm_usb.c
@@ -1235,11 +1235,10 @@ hdm_probe(struct usb_interface *interface, const struct usb_device_id *id)
 	num_endpoints = usb_iface_desc->desc.bNumEndpoints;
 	mutex_init(&mdev->io_mutex);
 	INIT_WORK(&mdev->poll_work_obj, wq_netinfo);
-	init_timer(&mdev->link_stat_timer);
+	setup_timer(&mdev->link_stat_timer, link_stat_timer_handler,
+		    (unsigned long)mdev);
 
 	mdev->usb_device = usb_dev;
-	mdev->link_stat_timer.function = link_stat_timer_handler;
-	mdev->link_stat_timer.data = (unsigned long)mdev;
 	mdev->link_stat_timer.expires = jiffies + (2 * HZ);
 
 	mdev->iface.mod = hdm_usb_fops.owner;
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] staging: most: hdm-usb: Use setup_timer
  2015-10-24  2:15 [PATCH] staging: most: hdm-usb: Use setup_timer Muhammad Falak R Wani
@ 2015-10-28 10:21 ` Christian Gromm
  0 siblings, 0 replies; 2+ messages in thread
From: Christian Gromm @ 2015-10-28 10:21 UTC (permalink / raw)
  To: Muhammad Falak R Wani
  Cc: Greg Kroah-Hartman, Andrey Shvetsov, Sudip Mukherjee,
	Masanari Iida, Adrian Remonda, devel, linux-kernel

On Sat, 24 Oct 2015 07:45:44 +0530
Muhammad Falak R Wani <falakreyaz@gmail.com> wrote:

> Use the timer API function setup_timer instead of init_timer, removing
> the structure field assignments.
> 
> <smpl>
> 
> @timer@
> expression e1,e2,e3,fn_ptr;
> @@
> -init_timer(&e1);
> +setup_timer(&e1, fn_ptr, e2);
> ... when != fn_ptr = e3
> -e1.function = fn_ptr;
> -e1.data = e2;
> 
> </smpl>
> 
> Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
Acked-by: Christian Gromm <christian.gromm@microchip.com>
> ---
>  drivers/staging/most/hdm-usb/hdm_usb.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/most/hdm-usb/hdm_usb.c b/drivers/staging/most/hdm-usb/hdm_usb.c
> index 0bf38c4..2e07313 100644
> --- a/drivers/staging/most/hdm-usb/hdm_usb.c
> +++ b/drivers/staging/most/hdm-usb/hdm_usb.c
> @@ -1235,11 +1235,10 @@ hdm_probe(struct usb_interface *interface, const struct usb_device_id *id)
>  	num_endpoints = usb_iface_desc->desc.bNumEndpoints;
>  	mutex_init(&mdev->io_mutex);
>  	INIT_WORK(&mdev->poll_work_obj, wq_netinfo);
> -	init_timer(&mdev->link_stat_timer);
> +	setup_timer(&mdev->link_stat_timer, link_stat_timer_handler,
> +		    (unsigned long)mdev);
>  
>  	mdev->usb_device = usb_dev;
> -	mdev->link_stat_timer.function = link_stat_timer_handler;
> -	mdev->link_stat_timer.data = (unsigned long)mdev;
>  	mdev->link_stat_timer.expires = jiffies + (2 * HZ);
>  
>  	mdev->iface.mod = hdm_usb_fops.owner;


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-10-28 10:26 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-24  2:15 [PATCH] staging: most: hdm-usb: Use setup_timer Muhammad Falak R Wani
2015-10-28 10:21 ` Christian Gromm

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).