From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757626AbcBDNWL (ORCPT ); Thu, 4 Feb 2016 08:22:11 -0500 Received: from mail-am1on0134.outbound.protection.outlook.com ([157.56.112.134]:9360 "EHLO emea01-am1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753152AbcBDNWJ convert rfc822-to-8bit (ORCPT ); Thu, 4 Feb 2016 08:22:09 -0500 From: "Gujulan Elango, Hari Prasath (H.)" To: "gregkh@linuxfoundation.org" , "hal.rosenstock@gmail.com" , "infinipath@intel.com" , "jgunthorpe@obsidianresearch.com" , "ira.weiny@intel.com" , "sagig@mellanox.com" CC: "swise@opengridcomputing.com" , "matanb@mellanox.com" , "devel@driverdev.osuosl.org" , "linux-kernel@vger.kernel.org" , "linux-rdma@vger.kernel.org" Subject: [PATCH] staging: rdma: use setup_timer() api Thread-Topic: [PATCH] staging: rdma: use setup_timer() api Thread-Index: AQHRX08K2SsRM/HKmkGGe6abokhgPw== Date: Thu, 4 Feb 2016 13:22:05 +0000 Message-ID: <20160204132316.GA25672@IND12F0122> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: linuxfoundation.org; dkim=none (message not signed) header.d=none;linuxfoundation.org; dmarc=none action=none header.from=visteon.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [74.112.164.118] x-microsoft-exchange-diagnostics: 1;DB5PR06MB1575;5:VUBtbaBR+GIc+a+EXLXRA7fDoqog74kqrPgsNIleFa3iSCOxTY20PYAO2CR0awHDAvLI2uvR5Yoecabpxm+wzaXkIHmZvLy8IrVFZ5KzC9UxxPQ8sE78gM0Dtkd5Hk91f0QZvZFoWx0zPFAxUwuL7w==;24:Hyewe98aDcgFjW1RUNO0COSQKbHlWtqeLfySDObNY4YTDAf2UyxrLqWGNBB4E7fizVH/P1dhSsajrUpppwzo/VIXCr+I+7PXxzPhaNjhzfk= x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DB5PR06MB1575; x-ms-office365-filtering-correlation-id: 3af2398d-7a0d-4200-53bd-08d32d662d3d x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(208512329853888); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001);SRVR:DB5PR06MB1575;BCL:0;PCL:0;RULEID:;SRVR:DB5PR06MB1575; x-forefront-prvs: 084285FC5C x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(6009001)(19580405001)(19580395003)(122556002)(86362001)(50986999)(54356999)(5002640100001)(3846002)(5001960100002)(189998001)(87936001)(1096002)(33716001)(1220700001)(5008740100001)(1076002)(6116002)(102836003)(229853001)(4326007)(106116001)(10400500002)(2906002)(586003)(2501003)(11100500001)(3660700001)(3280700002)(66066001)(33656002)(77096005)(2860100001)(2900100001)(40100003)(5001770100001)(2201001)(92566002);DIR:OUT;SFP:1102;SCL:1;SRVR:DB5PR06MB1575;H:DB5PR06MB1573.eurprd06.prod.outlook.com;FPR:;SPF:None;MLV:sfv;LANG:en; spamdiagnosticoutput: 1:23 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="us-ascii" Content-ID: <9EC918487913D54AB295F19EFE54CBA9@eurprd06.prod.outlook.com> Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 X-OriginatorOrg: visteon.com X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Feb 2016 13:22:05.7342 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 7a147aaf-01ec-498c-80a1-e34a8c63c548 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR06MB1575 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hari Prasath Gujulan Elango 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 --- drivers/staging/rdma/ehca/ehca_main.c | 3 +-- drivers/staging/rdma/hfi1/verbs.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) 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; /* -- 1.9.1