[PATCH 2/3] IB/nes: use setup_timer

Path	csiph.com!news.redatomik.org!aioe.org!bofh.it!news.nic.it!robomod
From	Geliang Tang <geliangtang@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH 2/3] IB/nes: use setup_timer
Date	Sat, 22 Apr 2017 03:40:01 +0200
Message-ID	<tySbL-4P8-3@gated-at.bofh.it> (permalink)
References	<tySbL-4P8-1@gated-at.bofh.it>
X-Original-To	Faisal Latif <faisal.latif@intel.com>, Doug Ledford <dledford@redhat.com>, Sean Hefty <sean.hefty@intel.com>, Hal Rosenstock <hal.rosenstock@gmail.com>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=ynfwub9D4X9MJA+O+KYZY5QDMM6gMuICtnJ6RhxhZzU=; b=GxE/VM10YxMWMuJeD1QuGdEBTQKigw6NliNWgJxTrVUne5BCq8PVe7ebYGmUDTHB/y hB8sEsUyPwo5VNPWj5y2y+Sjse7hlKm3lY39AS/pizOOCVs4DimJlM4xRzv7v22ovXwM jRF9boJGXC5hC54CzJTaV9lwEUSnteDaY8JDofQFKwWOq+HmHSK055rBG6poSIgVO4ur +5txzRGOSH+YK6q+XmYnKgc5ufK7ysduXPnPhLrA8+9KPpWdTXdbQshp9rlKX57R+cJd Dg/KlCGzaWTkngkeT43g/MsmI1g8FuB6HRULLw6Yh0LcH0nSJ2oMjA3xzcbOZriAGDNd bseg==
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=ynfwub9D4X9MJA+O+KYZY5QDMM6gMuICtnJ6RhxhZzU=; b=ZO1nM4E5NcUMSPDj1nW0ogu+JEJiPJVpmxjFy47nHH1/ejGaBu1hxIP3YbEaFEQGsM 942Kq4nIqTzY0b43LeiWKLjqD9g6OGvYFZIiFye/PLv9xWehe1OW+YCD/g6VcA9kjOZl yE7XqNAcl9Iym9Hpp4QHE/XVPgEzY2AG+9nnERlQ9viyj6GalEHSfxXPjOlHyc7EmIL+ KModwDVPSrwbfgmFYjEnd58Op0NnyMtoAGolYv/ugqdTp3lnOfabc6X1vW8IG/k8cWRP qYW9yR5hrrkzdOYUODD+yvKcrVAdthBIGpDMWlOEEgNuCI9phm0tm6lUzJ00swfvthTJ 1erA==
X-Gm-Message-State	AN3rC/43rLdp1j2AEfN1nC8n9LFxif5WdJ+jxHZuVgnJOShkIfTEvIr2 l2mriqq7jIdExg==
X-Received	by 10.99.108.133 with SMTP id h127mr14809208pgc.9.1492824823410; Fri, 21 Apr 2017 18:33:43 -0700 (PDT)
X-Mailer	git-send-email 2.9.3
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	59
Organization	linux.* mail to news gateway
X-Original-Cc	Geliang Tang <geliangtang@gmail.com>, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org
X-Original-Date	Sat, 22 Apr 2017 09:32:55 +0800
X-Original-Message-ID	<0423fafd41100d763a51d6b30bc10a135f245f76.1491892717.git.geliangtang@gmail.com>
X-Original-References	<628d01a8e7c4f93acaa1a6e91f739131704c2ff4.1491892717.git.geliangtang@gmail.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1628729

Show key headers only | View raw

Use setup_timer() instead of init_timer() to simplify the code.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 drivers/infiniband/hw/nes/nes_hw.c    | 5 ++---
 drivers/infiniband/hw/nes/nes_mgt.c   | 5 ++---
 drivers/infiniband/hw/nes/nes_verbs.c | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c
index 19acd13..5f77f0b 100644
--- a/drivers/infiniband/hw/nes/nes_hw.c
+++ b/drivers/infiniband/hw/nes/nes_hw.c
@@ -1849,9 +1849,8 @@ int nes_init_nic_qp(struct nes_device *nesdev, struct net_device *netdev)
 		wqe_count -= counter;
 		nes_write32(nesdev->regs+NES_WQE_ALLOC, (counter << 24) | nesvnic->nic.qp_id);
 	} while (wqe_count);
-	init_timer(&nesvnic->rq_wqes_timer);
-	nesvnic->rq_wqes_timer.function = nes_rq_wqes_timeout;
-	nesvnic->rq_wqes_timer.data = (unsigned long)nesvnic;
+	setup_timer(&nesvnic->rq_wqes_timer, nes_rq_wqes_timeout,
+		    (unsigned long)nesvnic);
 	nes_debug(NES_DBG_INIT, "NAPI support Enabled\n");
 	if (nesdev->nesadapter->et_use_adaptive_rx_coalesce)
 	{
diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
index 33624f1..77226cf 100644
--- a/drivers/infiniband/hw/nes/nes_mgt.c
+++ b/drivers/infiniband/hw/nes/nes_mgt.c
@@ -1040,9 +1040,8 @@ int nes_init_mgt_qp(struct nes_device *nesdev, struct net_device *netdev, struct
 			mgtvnic->mgt.rx_skb[counter] = skb;
 		}
 
-		init_timer(&mgtvnic->rq_wqes_timer);
-		mgtvnic->rq_wqes_timer.function = nes_mgt_rq_wqes_timeout;
-		mgtvnic->rq_wqes_timer.data = (unsigned long)mgtvnic;
+		setup_timer(&mgtvnic->rq_wqes_timer, nes_mgt_rq_wqes_timeout,
+			    (unsigned long)mgtvnic);
 
 		wqe_count = NES_MGT_WQ_COUNT - 1;
 		mgtvnic->mgt.rq_head = wqe_count;
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
index ccf0a4c..6913237 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -1308,9 +1308,8 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
 	init_completion(&nesqp->rq_drained);
 
 	nesqp->sig_all = (init_attr->sq_sig_type == IB_SIGNAL_ALL_WR);
-	init_timer(&nesqp->terminate_timer);
-	nesqp->terminate_timer.function = nes_terminate_timeout;
-	nesqp->terminate_timer.data = (unsigned long)nesqp;
+	setup_timer(&nesqp->terminate_timer, nes_terminate_timeout,
+		    (unsigned long)nesqp);
 
 	/* update the QP table */
 	nesdev->nesadapter->qp_table[nesqp->hwqp.qp_id-NES_FIRST_QPN] = nesqp;
-- 
2.9.3

Thread

[PATCH 1/3] IB/i40iw: use setup_timer Geliang Tang <geliangtang@gmail.com> - 2017-04-22 03:40 +0200
  [PATCH 2/3] IB/nes: use setup_timer Geliang Tang <geliangtang@gmail.com> - 2017-04-22 03:40 +0200
  [PATCH 3/3] IB/qib: use setup_timer Geliang Tang <geliangtang@gmail.com> - 2017-04-22 03:40 +0200

csiph-web