Message ID | 1506013525-29291-46-git-send-email-allen.lkml@gmail.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="n47HVofn"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xyk2J20z3z9sRq for <patchwork-incoming@ozlabs.org>; Fri, 22 Sep 2017 03:22:32 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752858AbdIURKd (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Thu, 21 Sep 2017 13:10:33 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:37875 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752854AbdIURK2 (ORCPT <rfc822;netdev@vger.kernel.org>); Thu, 21 Sep 2017 13:10:28 -0400 Received: by mail-pf0-f195.google.com with SMTP id e69so2714813pfg.4; Thu, 21 Sep 2017 10:10:27 -0700 (PDT) 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; bh=To2qV7pfrEjAew22cl01/sZMj6CsRtr+0gTzo3iCRzA=; b=n47HVofnnPlASwwnZQBG1SL+S83vpr+NQpwMzTshJhJhR1WydZIMdyUDdMh0VpBqGD TIlbQPKUSN41SZ/ynZgR6TvwTSVWYpu0nYJZtinoYSak8OH+iBHI4QEGEHIOyqMMU2TO Y/QbXOM58pfTmBwIJXFhnTYE3F8VEhiDR6vMrvqXfl8VSaZy0U0OMkAxlsjajMbIPTqs avEB+b0RWZhyDsfCvCkmCj8GTbFwE7EQBuoTZnku9GJ0D7Fg2qRex3b1AFvsU15hln1X 2x7nzfLYuue0O1RWirqJEp/V/ry0KUGRKBdJxzKX0dtKX0GQSg4MGv/g4B1qNsGp4CIy 2qUA== 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; bh=To2qV7pfrEjAew22cl01/sZMj6CsRtr+0gTzo3iCRzA=; b=KA3VGZkOOM1tkHPPXUGD3sd/v7UdFm8+MRsm9TGg8zd0WLE7kI/peeznyPyKLVl4Z7 CEYmv2tDUny69ED1Nnf7LpOsMOPs67d/nLnZhCqIW8QCTUCCzIfLApxpo2ziLH/K6KYh qJVaFxa87qccl42mLVSufuZACi7XCwNJMCirpDGcBuYogCUw9o/EeEmQrUkad3VsTV32 0oBACAkJbh/ndXjgdC4Rki1uTJm4Kz65bcSoI0+qRRcD/d5/54ctUkKU7j6RyUmqAxWF yd4qq34RV1AYmRHjuA+aBLHSN7DsdUMvbGW2FdpzPdPctQcz4Xl3TiU35gExRZyT7tCL CZUg== X-Gm-Message-State: AHPjjUjL12ol9/TSeD+pPR9C4LVVP7YYnLMU/O3/75X/NSfjOTBFIwPb xUJ1SkgpLivK4fm1G/sulgzxsLxc X-Google-Smtp-Source: AOwi7QALSk/u/6sVeN7QuWpJVZD+G0bJBVWqHL9YTjJhPvb4R0qPEfgqldmoqCnIDaQXzhxdCRi4ng== X-Received: by 10.99.126.84 with SMTP id o20mr6395865pgn.201.1506013827049; Thu, 21 Sep 2017 10:10:27 -0700 (PDT) Received: from localhost.localdomain ([103.42.74.194]) by smtp.gmail.com with ESMTPSA id p12sm3174090pgn.90.2017.09.21.10.10.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 10:10:25 -0700 (PDT) From: Allen Pais <allen.lkml@gmail.com> To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, m.grzeschik@pengutronix.de, dmitry.tarnyagin@lockless.no, wg@grandegger.com, mkl@pengutronix.de, mark.einon@gmail.com, linux@armlinux.org.uk, pcnet32@frontier.com, f.fainelli@gmail.com, bcm-kernel-feedback-list@broadcom.com, venza@brownhat.org, ajk@comnets.uni-bremen.de, jes@trained-monkey.org, romieu@fr.zoreil.com, khc@pm.waw.pl, simon@thekelleys.org.uk, davem@davemloft.net, linux-can@vger.kernel.org, adi-buildroot-devel@lists.sourceforge.net, Allen Pais <allen.lkml@gmail.com> Subject: [PATCH 45/64] drivers: net: fealnx: use setup_timer() helper. Date: Thu, 21 Sep 2017 22:35:06 +0530 Message-Id: <1506013525-29291-46-git-send-email-allen.lkml@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506013525-29291-1-git-send-email-allen.lkml@gmail.com> References: <1506013525-29291-1-git-send-email-allen.lkml@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
Series |
use setup_timer() helper function.
|
expand
|
diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c index e92859d..c898231 100644 --- a/drivers/net/ethernet/fealnx.c +++ b/drivers/net/ethernet/fealnx.c @@ -909,17 +909,13 @@ static int netdev_open(struct net_device *dev) printk(KERN_DEBUG "%s: Done netdev_open().\n", dev->name); /* Set the timer to check for link beat. */ - init_timer(&np->timer); + setup_timer(&np->timer, netdev_timer, (unsigned long)dev); np->timer.expires = RUN_AT(3 * HZ); - np->timer.data = (unsigned long) dev; - np->timer.function = netdev_timer; /* timer handler */ add_timer(&np->timer); - init_timer(&np->reset_timer); - np->reset_timer.data = (unsigned long) dev; - np->reset_timer.function = reset_timer; + setup_timer(&np->reset_timer, reset_timer, (unsigned long)dev); np->reset_timer_armed = 0; return rc; }
Use setup_timer function instead of initializing timer with the function and data fields. Signed-off-by: Allen Pais <allen.lkml@gmail.com> --- drivers/net/ethernet/fealnx.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)