Skip to contentSkip to conversation

staging: most: hdm-usb: Use setup_timer

PATCH In review Muhammad Falak R Wani 2 participants 2 messages Oct 24, 2015 – Oct 28, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: most: hdm-usb: Use setup_timer

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>

---
 drivers/staging/most/hdm-usb/hdm_usb.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/staging/most/hdm-usb/hdm_usb.c +2 -3
index 0bf38c4..2e07313 100644
@@ -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;
Signature · 1 line
1.9.1
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 14 lines · On Sat, 24 Oct 2015 07:45:44 +0530 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;
@@

(quoted diff) +1 -1
-init_timer(&e1);
+setup_timer(&e1, fn_ptr, e2);

... when != fn_ptr = e3

(quoted diff) +0 -2
-e1.function = fn_ptr;
-e1.data = e2;
Quoted 3 lines

</smpl>

Quoted 22 lines
---
 drivers/staging/most/hdm-usb/hdm_usb.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/staging/most/hdm-usb/hdm_usb.c +2 -3
index 0bf38c4..2e07313 100644
@@ -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;