Message ID | 1506013525-29291-58-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="DadPiUHr"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xyjsS1Kpcz9sRq for <patchwork-incoming@ozlabs.org>; Fri, 22 Sep 2017 03:14:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753152AbdIURLq (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Thu, 21 Sep 2017 13:11:46 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:33715 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751709AbdIURLn (ORCPT <rfc822;netdev@vger.kernel.org>); Thu, 21 Sep 2017 13:11:43 -0400 Received: by mail-pg0-f66.google.com with SMTP id i130so3757703pgc.0; Thu, 21 Sep 2017 10:11:42 -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=2e0LUit4/BWkjXs+coiCS5AETpmppUborVXEfCQB7+8=; b=DadPiUHrg4WIevjqsAraK9taL1OOqpP4ylOOMfQ27EUO8XK4LSvJgbwDv1ZO3ZsyfK kzg/w1HZLR3duiFoObG2GBv8JKYk5t4iKdsifxRGoheWr7OPGVi7rKPp9IUFlIHRxkBo JB360tR0/+cTmlcBahYzqXHeoSjRQ+5o3er1/j0E+zvBH54+Ep0OBLhF5eJQLne/eU3+ ZgTOThmVhjbpm8gUqAp3wJU/P9Trp5G3CoFBbc8iuHJmVwirsnNR/vPSjHa5AMGRjNL+ BhSfnJw/zehcg0AV7y9dHy3FEJs1pGdFVVBIGW86FMXuxdqGKWvNfzL7lMv/BrNUu5WF fcKA== 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=2e0LUit4/BWkjXs+coiCS5AETpmppUborVXEfCQB7+8=; b=JKdaNFB4hp/VvFfqBBpIORr5nqtTpdOHbLsh5k1aZnPEqoLLF15+FcWBPON2Cl3k6t /drYsxqBhQ9t2HgZKMnMFA9CHt5kZHR4JkEZHozNGnjEMXiNRy0fWswCtfR88vEubJ6H rTKxDLhYQEBkMELauf0mjRgKFGRxAy8Ib6VKgMUWdYX8casWuAd4+p3yBgK7+ypWhHdP /ge1IQqjBMSS9o7JWbWGm2y+bgpXnjlu76fVR2H8HQ+mQSWOwOgNVllsJ3AKWjUUZdU+ Zo5DtQCBgoJE15mDgaUd+UPxCXw2gSRLiE3xCle0q9qhWOCL4qjocZGvK5sm6vzmQWp/ O3hg== X-Gm-Message-State: AHPjjUimCJAy0AqTk798wVv0C/DPrVhFlhqOgJ0rl80ZV9oNg846C/FE xHEdqjj866f5AqLmxN/UiB1z9vrb X-Google-Smtp-Source: AOwi7QAa+aRlu7bNuT1um3+XnzxSu7PB9qye50yermHwEMZmFAjnYwHN1SH8yGNkxAHBA8PBmLtCtQ== X-Received: by 10.101.82.9 with SMTP id o9mr6532872pgp.42.1506013902318; Thu, 21 Sep 2017 10:11:42 -0700 (PDT) Received: from localhost.localdomain ([103.42.74.194]) by smtp.gmail.com with ESMTPSA id p12sm3174090pgn.90.2017.09.21.10.11.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 10:11:41 -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 57/64] drivers: net: stmmac: use setup_timer() helper. Date: Thu, 21 Sep 2017 22:35:18 +0530 Message-Id: <1506013525-29291-58-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/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 1763e48..f41661a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2217,10 +2217,8 @@ static void stmmac_init_tx_coalesce(struct stmmac_priv *priv) { priv->tx_coal_frames = STMMAC_TX_FRAMES; priv->tx_coal_timer = STMMAC_COAL_TX_TIMER; - init_timer(&priv->txtimer); + setup_timer(&priv->txtimer, stmmac_tx_timer, (unsigned long)priv); priv->txtimer.expires = STMMAC_COAL_TIMER(priv->tx_coal_timer); - priv->txtimer.data = (unsigned long)priv; - priv->txtimer.function = stmmac_tx_timer; add_timer(&priv->txtimer); }
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/stmicro/stmmac/stmmac_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)