Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752116AbdIXLv1 (ORCPT ); Sun, 24 Sep 2017 07:51:27 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:38162 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752004AbdIXLvZ (ORCPT ); Sun, 24 Sep 2017 07:51:25 -0400 X-Google-Smtp-Source: AOwi7QDPcjG0uGhuUFA6glE5zXREd0RvhnDfTch7UWqTA5ibpMJnsJM58Ei59rctsYuFyqrZbkd0UQ== From: Himanshu Jha To: dledford@redhat.com Cc: infinipath@intel.com, sean.hefty@intel.com, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, Himanshu Jha Subject: [PATCH] IB/qib: Use setup_timer and mod_timer Date: Sun, 24 Sep 2017 17:21:07 +0530 Message-Id: <1506253867-5132-1-git-send-email-himanshujha199640@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2421 Lines: 65 Use setup_timer and mod_timer API instead of structure assignments. This is done using Coccinelle and semantic patch used for this as follows: @@ expression x,y,z,a,b; @@ -init_timer (&x); +setup_timer (&x, y, z); +mod_timer (&a, b); -x.function = y; -x.data = z; -x.expires = b; -add_timer(&a); Signed-off-by: Himanshu Jha --- drivers/infiniband/hw/qib/qib_driver.c | 8 +++----- drivers/infiniband/hw/qib/qib_mad.c | 10 ++++------ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/infiniband/hw/qib/qib_driver.c b/drivers/infiniband/hw/qib/qib_driver.c index 719906a..2314e8a 100644 --- a/drivers/infiniband/hw/qib/qib_driver.c +++ b/drivers/infiniband/hw/qib/qib_driver.c @@ -735,11 +735,9 @@ void qib_set_led_override(struct qib_pportdata *ppd, unsigned int val) */ if (atomic_inc_return(&ppd->led_override_timer_active) == 1) { /* Need to start timer */ - init_timer(&ppd->led_override_timer); - ppd->led_override_timer.function = qib_run_led_override; - ppd->led_override_timer.data = (unsigned long) ppd; - ppd->led_override_timer.expires = jiffies + 1; - add_timer(&ppd->led_override_timer); + setup_timer(&ppd->led_override_timer, qib_run_led_override, + (unsigned long)ppd); + mod_timer(&ppd->led_override_timer, jiffies + 1); } else { if (ppd->led_override_vals[0] || ppd->led_override_vals[1]) mod_timer(&ppd->led_override_timer, jiffies + 1); diff --git a/drivers/infiniband/hw/qib/qib_mad.c b/drivers/infiniband/hw/qib/qib_mad.c index 82d9da9..1237952 100644 --- a/drivers/infiniband/hw/qib/qib_mad.c +++ b/drivers/infiniband/hw/qib/qib_mad.c @@ -2478,12 +2478,10 @@ void qib_notify_create_mad_agent(struct rvt_dev_info *rdi, int port_idx) /* Initialize xmit_wait structure */ dd->pport[port_idx].cong_stats.counter = 0; - init_timer(&dd->pport[port_idx].cong_stats.timer); - dd->pport[port_idx].cong_stats.timer.function = xmit_wait_timer_func; - dd->pport[port_idx].cong_stats.timer.data = - (unsigned long)(&dd->pport[port_idx]); - dd->pport[port_idx].cong_stats.timer.expires = 0; - add_timer(&dd->pport[port_idx].cong_stats.timer); + setup_timer(&dd->pport[port_idx].cong_stats.timer, + xmit_wait_timer_func, + (unsigned long)(&dd->pport[port_idx])); + mod_timer(&dd->pport[port_idx].cong_stats.timer, 0); } void qib_notify_free_mad_agent(struct rvt_dev_info *rdi, int port_idx) -- 2.7.4