Commit 2f83aeda authored by Aya Mahfouz's avatar Aya Mahfouz Committed by Greg Kroah-Hartman

staging: wlan-ng: replace init_timer by setup_timer

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: default avatarAya Mahfouz <mahfouz.saif.elyazal@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e469616b
...@@ -557,17 +557,13 @@ void hfa384x_create(hfa384x_t *hw, struct usb_device *usb) ...@@ -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->link_bh, prism2sta_processing_defer);
INIT_WORK(&hw->usb_work, hfa384x_usb_defer); INIT_WORK(&hw->usb_work, hfa384x_usb_defer);
init_timer(&hw->throttle); setup_timer(&hw->throttle, hfa384x_usb_throttlefn, (unsigned long)hw);
hw->throttle.function = hfa384x_usb_throttlefn;
hw->throttle.data = (unsigned long)hw;
init_timer(&hw->resptimer); setup_timer(&hw->resptimer, hfa384x_usbctlx_resptimerfn,
hw->resptimer.function = hfa384x_usbctlx_resptimerfn; (unsigned long)hw);
hw->resptimer.data = (unsigned long)hw;
init_timer(&hw->reqtimer); setup_timer(&hw->reqtimer, hfa384x_usbctlx_reqtimerfn,
hw->reqtimer.function = hfa384x_usbctlx_reqtimerfn; (unsigned long)hw);
hw->reqtimer.data = (unsigned long)hw;
usb_init_urb(&hw->rx_urb); usb_init_urb(&hw->rx_urb);
usb_init_urb(&hw->tx_urb); usb_init_urb(&hw->tx_urb);
...@@ -577,9 +573,8 @@ void hfa384x_create(hfa384x_t *hw, struct usb_device *usb) ...@@ -577,9 +573,8 @@ void hfa384x_create(hfa384x_t *hw, struct usb_device *usb)
hw->state = HFA384x_STATE_INIT; hw->state = HFA384x_STATE_INIT;
INIT_WORK(&hw->commsqual_bh, prism2sta_commsqual_defer); INIT_WORK(&hw->commsqual_bh, prism2sta_commsqual_defer);
init_timer(&hw->commsqual_timer); setup_timer(&hw->commsqual_timer, prism2sta_commsqual_timer,
hw->commsqual_timer.data = (unsigned long)hw; (unsigned long)hw);
hw->commsqual_timer.function = prism2sta_commsqual_timer;
} }
/*---------------------------------------------------------------- /*----------------------------------------------------------------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment