Prechádzať zdrojové kódy

IB/qib,staging/rdma/hfi1: use setup_timer api

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 <hgujulan@visteon.com>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Hari Prasath Gujulan Elango 9 rokov pred
rodič
commit
045277cf15

+ 1 - 3
drivers/infiniband/hw/qib/qib_verbs.c

@@ -1602,9 +1602,7 @@ int qib_register_ib_device(struct qib_devdata *dd)
 		init_ibport(ppd + i);
 		init_ibport(ppd + i);
 
 
 	/* Only need to initialize non-zero fields. */
 	/* Only need to initialize non-zero fields. */
-	init_timer(&dev->mem_timer);
-	dev->mem_timer.function = mem_timer;
-	dev->mem_timer.data = (unsigned long) dev;
+	setup_timer(&dev->mem_timer, mem_timer, (unsigned long)dev);
 
 
 	qpt_mask = dd->qpn_mask;
 	qpt_mask = dd->qpn_mask;
 
 

+ 1 - 3
drivers/staging/rdma/hfi1/verbs.c

@@ -1455,9 +1455,7 @@ int hfi1_register_ib_device(struct hfi1_devdata *dd)
 
 
 	/* Only need to initialize non-zero fields. */
 	/* Only need to initialize non-zero fields. */
 
 
-	init_timer(&dev->mem_timer);
-	dev->mem_timer.function = mem_timer;
-	dev->mem_timer.data = (unsigned long) dev;
+	setup_timer(&dev->mem_timer, mem_timer, (unsigned long)dev);
 
 
 	seqlock_init(&dev->iowait_lock);
 	seqlock_init(&dev->iowait_lock);
 	INIT_LIST_HEAD(&dev->txwait);
 	INIT_LIST_HEAD(&dev->txwait);