mirror of https://gitee.com/openkylin/linux.git
IB/qib: Use setup_timer and mod_timer
Use setup_timer and mod_timer API instead of structure assignments. This is done using Coccinelle and semantic patch used for this as follows: @@ expression x,y,z,a,b; @@ -init_timer (&x); +setup_timer (&x, y, z); +mod_timer (&a, b); -x.function = y; -x.data = z; -x.expires = b; -add_timer(&a); Signed-off-by: Himanshu Jha <himanshujha199640@gmail.com> Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
parent
e538e0aca3
commit
e1ac263fcb
|
@ -735,11 +735,9 @@ void qib_set_led_override(struct qib_pportdata *ppd, unsigned int val)
|
||||||
*/
|
*/
|
||||||
if (atomic_inc_return(&ppd->led_override_timer_active) == 1) {
|
if (atomic_inc_return(&ppd->led_override_timer_active) == 1) {
|
||||||
/* Need to start timer */
|
/* Need to start timer */
|
||||||
init_timer(&ppd->led_override_timer);
|
setup_timer(&ppd->led_override_timer, qib_run_led_override,
|
||||||
ppd->led_override_timer.function = qib_run_led_override;
|
(unsigned long)ppd);
|
||||||
ppd->led_override_timer.data = (unsigned long) ppd;
|
mod_timer(&ppd->led_override_timer, jiffies + 1);
|
||||||
ppd->led_override_timer.expires = jiffies + 1;
|
|
||||||
add_timer(&ppd->led_override_timer);
|
|
||||||
} else {
|
} else {
|
||||||
if (ppd->led_override_vals[0] || ppd->led_override_vals[1])
|
if (ppd->led_override_vals[0] || ppd->led_override_vals[1])
|
||||||
mod_timer(&ppd->led_override_timer, jiffies + 1);
|
mod_timer(&ppd->led_override_timer, jiffies + 1);
|
||||||
|
|
|
@ -2478,12 +2478,10 @@ void qib_notify_create_mad_agent(struct rvt_dev_info *rdi, int port_idx)
|
||||||
|
|
||||||
/* Initialize xmit_wait structure */
|
/* Initialize xmit_wait structure */
|
||||||
dd->pport[port_idx].cong_stats.counter = 0;
|
dd->pport[port_idx].cong_stats.counter = 0;
|
||||||
init_timer(&dd->pport[port_idx].cong_stats.timer);
|
setup_timer(&dd->pport[port_idx].cong_stats.timer,
|
||||||
dd->pport[port_idx].cong_stats.timer.function = xmit_wait_timer_func;
|
xmit_wait_timer_func,
|
||||||
dd->pport[port_idx].cong_stats.timer.data =
|
(unsigned long)(&dd->pport[port_idx]));
|
||||||
(unsigned long)(&dd->pport[port_idx]);
|
mod_timer(&dd->pport[port_idx].cong_stats.timer, 0);
|
||||||
dd->pport[port_idx].cong_stats.timer.expires = 0;
|
|
||||||
add_timer(&dd->pport[port_idx].cong_stats.timer);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void qib_notify_free_mad_agent(struct rvt_dev_info *rdi, int port_idx)
|
void qib_notify_free_mad_agent(struct rvt_dev_info *rdi, int port_idx)
|
||||||
|
|
Loading…
Reference in New Issue