From patchwork Fri Feb 27 18:10:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaishali Thakkar X-Patchwork-Id: 444387 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id CC606140119 for ; Sat, 28 Feb 2015 05:10:49 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=VYuDnuix; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754719AbbB0SKc (ORCPT ); Fri, 27 Feb 2015 13:10:32 -0500 Received: from mail-pd0-f176.google.com ([209.85.192.176]:41892 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753261AbbB0SKa (ORCPT ); Fri, 27 Feb 2015 13:10:30 -0500 Received: by pdno5 with SMTP id o5so22697125pdn.8; Fri, 27 Feb 2015 10:10:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=YNoDXy4nhF2q9Md9zftKUbRolotZI5y4oIhxal8I3IY=; b=VYuDnuixWlDVqKEr8Auv+Ci380K1KREHqTsRJnwPVR8WVgC3K8VhuuKIHWt3UXAjnK 35uEEGdgeaMp4UgTpETd0kH7/XtwPmQ0uS1Y3M4hi2TSi/QLKjbM3z5XW2/2zKOt2jik 9/ghiXUlr1r1pOUUXBxXVYQXU0yT0SjSPVPS2aUrqN8/sHMbq2eLW1iXbDuZxk1CrIUo HIRzBTuHogaeCt49rmOQstvVGFCdPWNd6RWIeIxt4NDxnLrfKoitJGP2+iBKvzS8j0x/ NHkfZI0KGoY0rYGkZZIMS0WHOA4rVFTGtTTRpRyTghmQgJCajhtOxZ6ryivoXFIRP1DC It3Q== X-Received: by 10.68.171.68 with SMTP id as4mr2900896pbc.21.1425060630058; Fri, 27 Feb 2015 10:10:30 -0800 (PST) Received: from vaishali-Ideapad-Z570 ([43.249.235.97]) by mx.google.com with ESMTPSA id fk1sm1453092pab.16.2015.02.27.10.10.28 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 27 Feb 2015 10:10:29 -0800 (PST) Date: Fri, 27 Feb 2015 23:40:24 +0530 From: Vaishali Thakkar To: "David S. Miller" Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] net: smc91c92_cs: Use setup_timer and mod_timer Message-ID: <20150227181024.GA20055@vaishali-Ideapad-Z570> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use timer API functions setup_timer and mod_timer instead of structure assignments as they are standard way to set the timer and to update the expire field of an active timer respectively. This is done using Coccinelle and semantic patch used for this is 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: Vaishali Thakkar --- Changes since v1: -Change subject line drivers/net/ethernet/smsc/smc91c92_cs.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/smsc/smc91c92_cs.c b/drivers/net/ethernet/smsc/smc91c92_cs.c index 6b33127..3449893 100644 --- a/drivers/net/ethernet/smsc/smc91c92_cs.c +++ b/drivers/net/ethernet/smsc/smc91c92_cs.c @@ -1070,11 +1070,8 @@ static int smc_open(struct net_device *dev) smc->packets_waiting = 0; smc_reset(dev); - init_timer(&smc->media); - smc->media.function = media_check; - smc->media.data = (u_long) dev; - smc->media.expires = jiffies + HZ; - add_timer(&smc->media); + setup_timer(&smc->media, media_check, (u_long)dev); + mod_timer(&smc->media, jiffies + HZ); return 0; } /* smc_open */