Message ID | 1506013525-29291-25-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="TsihKjph"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xykFy4gZ7z9s3T for <patchwork-incoming@ozlabs.org>; Fri, 22 Sep 2017 03:32:38 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752439AbdIURIR (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Thu, 21 Sep 2017 13:08:17 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34636 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752427AbdIURIO (ORCPT <rfc822;netdev@vger.kernel.org>); Thu, 21 Sep 2017 13:08:14 -0400 Received: by mail-pf0-f193.google.com with SMTP id g65so2721823pfe.1; Thu, 21 Sep 2017 10:08:14 -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=/VPj6YvMv7uCo7Nd9bgIBhR2TRv9i77kfeCYmjiy00k=; b=TsihKjph8rff+dFKuwssgoT39D2Za4RV6Lp0clZnYqNE81QiVLlvAaREmgL/TARIht A5cjdAvmGsC1LGX9pYrUxWdxtW/NxbU9uUVXiZd4XYnZRlwy+8GS0UJMo8h5fBy6Y6MN w+P7v949A6oHgSWAU8HWpNi5asvPkVz+wC2ZueLnScIP7rqfk2xWBJb9dF4krV5igD84 nymLMyvau1cHA7cOV8sRERoLrNXSsGnfoke9hB/y12WI9rKLCQUuGMiSpAr3uhMk9dLO JGB3IXY35/U1sr904RrO+pf6yk/vzxDuOkp/Qam9bUdtXcJJNaySRV1Xco/xmzCDFN56 jaEw== 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=/VPj6YvMv7uCo7Nd9bgIBhR2TRv9i77kfeCYmjiy00k=; b=cbLK9pKisIiSkZf8dWicfCZufdnXMShc2CC+xwjJQBvgvJ1x12eXKLfaIWgt/w63t3 NuUgLwRme4WQ+6SmmY0SeFQOx2jZiwx/dwto92DKanr+2UJwSoxeFn6Q2xcofDmJcBJJ F7t8Csq5qET/AwMqWAbIpPfK9/cvRB2+WuL1k9kIHFc6mS8zEgfn+fEDm2jULy6cZn6D fvuGAPHrq/kh90LR1zt+tmmcFFD7rBOpS+8oxWQcjXRT+Baz4DnEX2lePEZR3hDLulG1 54yWhdViF8+EQz8mCVDAOOr4pA9v1P+QFIb4NShvUVneoO+rhF/gcLUeSqXsj8bmy0oy PoSA== X-Gm-Message-State: AHPjjUhpawsu3v4w/WxWxtnBQcitBj+MYl8n71+jU0tTofNYvDIcMWR+ 77U1IutUn2jsah8OJW5GwXmCqCT3 X-Google-Smtp-Source: AOwi7QA1oRiyWzzSq6CECF75fXHlGUL79yyZPOyp8yS0UEeNVnN25MC5OJ5iFw/oZCmrzRbVyi5DWg== X-Received: by 10.159.204.147 with SMTP id t19mr6190936plo.242.1506013693652; Thu, 21 Sep 2017 10:08:13 -0700 (PDT) Received: from localhost.localdomain ([103.42.74.194]) by smtp.gmail.com with ESMTPSA id p12sm3174090pgn.90.2017.09.21.10.08.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 10:08:12 -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 24/64] drivers: net: enic: use setup_timer() helper. Date: Thu, 21 Sep 2017 22:34:45 +0530 Message-Id: <1506013525-29291-25-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/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c index d24ee1a..4a11baf 100644 --- a/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/drivers/net/ethernet/cisco/enic/enic_main.c @@ -2846,9 +2846,8 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) /* Setup notification timer, HW reset task, and wq locks */ - init_timer(&enic->notify_timer); - enic->notify_timer.function = enic_notify_timer; - enic->notify_timer.data = (unsigned long)enic; + setup_timer(&enic->notify_timer, enic_notify_timer, + (unsigned long)enic); enic_set_rx_coal_setting(enic); INIT_WORK(&enic->reset, enic_reset);
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/cisco/enic/enic_main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)