From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753039AbbJXCSL (ORCPT ); Fri, 23 Oct 2015 22:18:11 -0400 Received: from mail-pa0-f65.google.com ([209.85.220.65]:36003 "EHLO mail-pa0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751118AbbJXCSJ (ORCPT ); Fri, 23 Oct 2015 22:18:09 -0400 From: Muhammad Falak R Wani To: Mike Marciniszyn , Doug Ledford , Sean Hefty , Hal Rosenstock , Greg Kroah-Hartman , linux-rdma@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Cc: Muhammad Falak R Wani Subject: [PATCH 3/4] staging: rdma: ipath: Use setup_timer Date: Sat, 24 Oct 2015 07:52:41 +0530 Message-Id: <1445653361-3012-1-git-send-email-falakreyaz@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use the timer API function setup_timer instead of init_timer, removing the structure field assignments. Signed-off-by: Muhammad Falak R Wani --- drivers/staging/rdma/ipath/ipath_sdma.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rdma/ipath/ipath_sdma.c b/drivers/staging/rdma/ipath/ipath_sdma.c index 17a5177..1ffc06a 100644 --- a/drivers/staging/rdma/ipath/ipath_sdma.c +++ b/drivers/staging/rdma/ipath/ipath_sdma.c @@ -400,9 +400,9 @@ static int alloc_sdma(struct ipath_devdata *dd) } dd->ipath_sdma_head_dma[0] = 0; - init_timer(&dd->ipath_sdma_vl15_timer); - dd->ipath_sdma_vl15_timer.function = vl15_watchdog_timeout; - dd->ipath_sdma_vl15_timer.data = (unsigned long)dd; + setup_timer(&dd->ipath_sdma_vl15_timer, vl15_watchdog_timeout, + (unsigned long)dd); + atomic_set(&dd->ipath_sdma_vl15_count, 0); goto done; -- 1.9.1