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

Commit d6a0692b authored by Muhammad Falak R Wani's avatar Muhammad Falak R Wani Committed by Greg Kroah-Hartman
Browse files

staging: ipath: ipath_init_chip: Use setup_timer 



Use of the timer API function setup_timer instead of init_timer, removing
the structure field assignments, and make the codeflow more readable.
The simplified sematic patch used is :-
<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>

Signed-off-by: default avatarMuhammad Falak R Wani <falakreyaz@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7cc918a8

drivers/staging/rdma/ipath/ipath_init_chip.c

+7 −11
Original line number Diff line number Diff line
@@ -950,9 +950,8 @@ int ipath_init_chip(struct ipath_devdata *dd, int reinit) 
		 * set up stats retrieval timer, even if we had errors

		 * in last portion of setup

		 */

		init_timer(&dd->ipath_stats_timer);

		dd->ipath_stats_timer.function = ipath_get_faststats;

		dd->ipath_stats_timer.data = (unsigned long) dd;

		setup_timer(&dd->ipath_stats_timer, ipath_get_faststats,

				(unsigned long)dd);

		/* every 5 seconds; */

		dd->ipath_stats_timer.expires = jiffies + 5 * HZ;

		/* takes ~16 seconds to overflow at full IB 4x bandwdith */
@@ -965,9 +964,8 @@ int ipath_init_chip(struct ipath_devdata *dd, int reinit) 
		ret = setup_sdma(dd);



	/* Set up HoL state */

	init_timer(&dd->ipath_hol_timer);

	dd->ipath_hol_timer.function = ipath_hol_event;

	dd->ipath_hol_timer.data = (unsigned long)dd;

	setup_timer(&dd->ipath_hol_timer, ipath_hol_event, (unsigned long)dd);



	dd->ipath_hol_state = IPATH_HOL_UP;



done:
@@ -988,11 +986,9 @@ int ipath_init_chip(struct ipath_devdata *dd, int reinit) 
			 * to an alternate if necessary and possible

			 */

			if (!reinit) {

				init_timer(&dd->ipath_intrchk_timer);

				dd->ipath_intrchk_timer.function =

					verify_interrupt;

				dd->ipath_intrchk_timer.data =

					(unsigned long) dd;

				setup_timer(&dd->ipath_intrchk_timer,

						verify_interrupt,

						(unsigned long)dd);

			}

			dd->ipath_intrchk_timer.expires = jiffies + HZ/2;

			add_timer(&dd->ipath_intrchk_timer);