Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1ac263f authored by Himanshu Jha's avatar Himanshu Jha Committed by Doug Ledford
Browse files

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: default avatarHimanshu Jha <himanshujha199640@gmail.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent e538e0ac

drivers/infiniband/hw/qib/qib_driver.c

+3 −5
Original line number Diff line number Diff line
@@ -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) {

		/* Need to start timer */

		init_timer(&ppd->led_override_timer);

		ppd->led_override_timer.function = qib_run_led_override;

		ppd->led_override_timer.data = (unsigned long) ppd;

		ppd->led_override_timer.expires = jiffies + 1;

		add_timer(&ppd->led_override_timer);

		setup_timer(&ppd->led_override_timer, qib_run_led_override,

			    (unsigned long)ppd);

		mod_timer(&ppd->led_override_timer, jiffies + 1);

	} else {

		if (ppd->led_override_vals[0] || ppd->led_override_vals[1])

			mod_timer(&ppd->led_override_timer, jiffies + 1);

drivers/infiniband/hw/qib/qib_mad.c

+4 −6
Original line number Diff line number Diff line
@@ -2478,12 +2478,10 @@ void qib_notify_create_mad_agent(struct rvt_dev_info *rdi, int port_idx) 


	/* Initialize xmit_wait structure */

	dd->pport[port_idx].cong_stats.counter = 0;

	init_timer(&dd->pport[port_idx].cong_stats.timer);

	dd->pport[port_idx].cong_stats.timer.function = xmit_wait_timer_func;

	dd->pport[port_idx].cong_stats.timer.data =

		(unsigned long)(&dd->pport[port_idx]);

	dd->pport[port_idx].cong_stats.timer.expires = 0;

	add_timer(&dd->pport[port_idx].cong_stats.timer);

	setup_timer(&dd->pport[port_idx].cong_stats.timer,

		    xmit_wait_timer_func,

		    (unsigned long)(&dd->pport[port_idx]));

	mod_timer(&dd->pport[port_idx].cong_stats.timer, 0);

}



void qib_notify_free_mad_agent(struct rvt_dev_info *rdi, int port_idx)