staging: rdma: use setup_timer() api

Commit Message

Gujulan Elango, Hari Prasath (H.) Feb. 4, 2016, 1:22 p.m. UTC

From: Hari Prasath Gujulan Elango <[e-mail]>

Date: Thu, 4 Feb 2016 18:46:31 +0530
Replace the timer API's to initialize a timer & then assign the callback
function by the setup_timer() API.

Signed-off-by: Hari Prasath Gujulan Elango <[e-mail]>
---
 drivers/staging/rdma/ehca/ehca_main.c | 3 +--
 drivers/staging/rdma/hfi1/verbs.c     | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

Comments

Ira Weiny Feb. 4, 2016, 5:32 p.m. UTC | #1

On Thu, Feb 04, 2016 at 09:38:32AM -0600, Mike Marciniszyn wrote:
> > Subject: [PATCH] staging: rdma: use setup_timer() api
> > 
> > From: Hari Prasath Gujulan Elango <[e-mail]>
> > 
> 
> Doug,
> 
> We are going to add this to the rdmavt/hfi1/qib work, with the appropriate authorship credit.   Otherwise, there will certainly be conflicts.
> 
> Hari,
> 
> Note that ehca is going away.

Actually ehca is already gone.  From Dougs for-4.5-rc tree.

12:30:25 > ls
Kconfig  Makefile  hfi1/

Ira

> 
> In addition,  you missed exploiting the third argument to setup_timer() for the callback context.
> 
> Mike
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/staging/rdma/ehca/ehca_main.c b/drivers/staging/rdma/ehca/ehca_main.c
index 832f22f..e545712 100644
--- a/drivers/staging/rdma/ehca/ehca_main.c
+++ b/drivers/staging/rdma/ehca/ehca_main.c
@@ -1073,8 +1073,7 @@  static int __init ehca_module_init(void)
 		ehca_gen_err("WARNING!!!");
 		ehca_gen_err("It is possible to lose interrupts.");
 	} else {
-		init_timer(&poll_eqs_timer);
-		poll_eqs_timer.function = ehca_poll_eqs;
+		setup_timer(&poll_eqs_timer, ehca_poll_eqs, 0UL);
 		poll_eqs_timer.expires = jiffies + HZ;
 		add_timer(&poll_eqs_timer);
 	}
diff --git a/drivers/staging/rdma/hfi1/verbs.c b/drivers/staging/rdma/hfi1/verbs.c
index 09b8d41..769388d 100644
--- a/drivers/staging/rdma/hfi1/verbs.c
+++ b/drivers/staging/rdma/hfi1/verbs.c
@@ -1926,8 +1926,7 @@  int hfi1_register_ib_device(struct hfi1_devdata *dd)
 	spin_lock_init(&dev->n_qps_lock);
 	spin_lock_init(&dev->n_srqs_lock);
 	spin_lock_init(&dev->n_mcast_grps_lock);
-	init_timer(&dev->mem_timer);
-	dev->mem_timer.function = mem_timer;
+	setup_timer(&dev->mem_timer, mem_timer, 0UL);
 	dev->mem_timer.data = (unsigned long) dev;
 
 	/*