Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-18 18:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: wlan-ng: replace init_timer by setup_timer

Browse Source 
This patch replaces init_timer and the 2 step initialization of function
and data by setup_timer to make the code more concise.

The issue was discovered using the following coccinelle script:

@@
expression ds, e1, e2;
@@

-init_timer (&ds);
+setup_timer (&ds, e1, e2);
...
(
-ds.function = e1;
...
-ds.data = e2;
|
-ds.data = e2;
...
-ds.function = e1;
)

Signed-off-by: Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Aya Mahfouz 2015-02-19 07:55:43 +02:00 committed by Greg Kroah-Hartman
parent e469616ba6
commit 2f83aeda56
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/staging/wlan-ng/hfa384x_usb.c
View File

@ -557,17 +557,13 @@ void hfa384x_create(hfa384x_t *hw, struct usb_device *usb)
INIT_WORK(&hw->link_bh, prism2sta_processing_defer);
INIT_WORK(&hw->usb_work, hfa384x_usb_defer);
init_timer(&hw->throttle);
hw->throttle.function = hfa384x_usb_throttlefn;
hw->throttle.data = (unsigned long)hw;
setup_timer(&hw->throttle, hfa384x_usb_throttlefn, (unsigned long)hw);
init_timer(&hw->resptimer);
hw->resptimer.function = hfa384x_usbctlx_resptimerfn;
hw->resptimer.data = (unsigned long)hw;
setup_timer(&hw->resptimer, hfa384x_usbctlx_resptimerfn,
(unsigned long)hw);
init_timer(&hw->reqtimer);
hw->reqtimer.function = hfa384x_usbctlx_reqtimerfn;
hw->reqtimer.data = (unsigned long)hw;
setup_timer(&hw->reqtimer, hfa384x_usbctlx_reqtimerfn,
(unsigned long)hw);
usb_init_urb(&hw->rx_urb);
usb_init_urb(&hw->tx_urb);
@ -577,9 +573,8 @@ void hfa384x_create(hfa384x_t *hw, struct usb_device *usb)
hw->state = HFA384x_STATE_INIT;
INIT_WORK(&hw->commsqual_bh, prism2sta_commsqual_defer);
init_timer(&hw->commsqual_timer);
hw->commsqual_timer.data = (unsigned long)hw;
hw->commsqual_timer.function = prism2sta_commsqual_timer;
setup_timer(&hw->commsqual_timer, prism2sta_commsqual_timer,
(unsigned long)hw);
}
/*----------------------------------------------------------------