Message ID | 1506013525-29291-30-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="oBb/Bn5N"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xykD82bXxz9s3T for <patchwork-incoming@ozlabs.org>; Fri, 22 Sep 2017 03:31:04 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752544AbdIURIt (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Thu, 21 Sep 2017 13:08:49 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:34418 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751953AbdIURIq (ORCPT <rfc822;netdev@vger.kernel.org>); Thu, 21 Sep 2017 13:08:46 -0400 Received: by mail-pg0-f67.google.com with SMTP id u18so3754045pgo.1; Thu, 21 Sep 2017 10:08:46 -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=/hkme7G9zuUyjGGOrxT7E9ySi+cMgPJ7gW+UhVuniwo=; b=oBb/Bn5NP/8cHmx1m4Yjd+469gh0AQJMDiWJ+67K/CY1GDIEnJ7k8D/wH4NriXL4Py 4mqMND7n34X0CK+xTGLCcvQrf6dCTiScngf5kezCWQdFsHVjd49v5FhrhQRO5V2HnqPs LXsTnRhEF4zV3TC5rjZXFbnRZq36zXHXrB1wT5U9WXIv6R7cijFTY72NMUAjDkCDhBOt Ua6v1QXplCo4eeGbl06KyccVAlkEE/uuuvprIAqjAgzotngTxYDvL2eqtyeYE8RWsyNH Ntdiya4G3oIy355VF2evFEEu5bs+T2UxjdZfG4uvANChFZH3n4SNm33sXyUN16hGgQe7 I9XQ== 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=/hkme7G9zuUyjGGOrxT7E9ySi+cMgPJ7gW+UhVuniwo=; b=kxU8exgPTppfB4Porpg3rwYtU91t089rsfO0qeOvpHzytEtjQvvuln6GfTg6UxcBRi 3Sz+imFC+iECNzDUjbO2C9dfbl99XdaDRC0Xyp8sp1svtALJAT3p11+oTVQZX8yqDnPm wFyoQCcmilL6uk2UIE9N7bamPslufQWDDc8/7YeJ9g+TFrvS0c4JUP9kRUEZ2YdwSNVf LkUIhc/3eVIhoSFAATE6xpAsxcdWQwdNX5E9WUxIEn8zxu8ZUrEmDzrf92AtAk6utWIC 5z77hVzUGoGI0rs+L6xlN6QweMGG/d/AP0FhRK+BxbyHkaJ/lRFKjCotxN6LKviQmW/m NRtw== X-Gm-Message-State: AHPjjUhQH1tbESxW4Kt1DVDJpgAqt/whhZz056kXnb4D1HQP0EPdpZi8 dhFUwTNOo7UfE7eVh1exrRzz90sy X-Google-Smtp-Source: AOwi7QAOlxruyHjdAxhCrhCT/A+Zo7yCn5/UAknPk7+Fhao73bxBvHOBN7Vmcu42Fg1Hw+X4I5m/dw== X-Received: by 10.84.210.196 with SMTP id a62mr6188510pli.356.1506013725717; Thu, 21 Sep 2017 10:08:45 -0700 (PDT) Received: from localhost.localdomain ([103.42.74.194]) by smtp.gmail.com with ESMTPSA id p12sm3174090pgn.90.2017.09.21.10.08.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 10:08:44 -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 29/64] drivers: net: smsc: use setup_timer() helper. Date: Thu, 21 Sep 2017 22:34:50 +0530 Message-Id: <1506013525-29291-30-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/smsc/epic100.c b/drivers/net/ethernet/smsc/epic100.c index 6a0e1d4..2a97248 100644 --- a/drivers/net/ethernet/smsc/epic100.c +++ b/drivers/net/ethernet/smsc/epic100.c @@ -739,10 +739,8 @@ static int epic_open(struct net_device *dev) /* Set the timer to switch to check for link beat and perhaps switch to an alternate media type. */ - init_timer(&ep->timer); + setup_timer(&ep->timer, epic_timer, (unsigned long)dev); ep->timer.expires = jiffies + 3*HZ; - ep->timer.data = (unsigned long)dev; - ep->timer.function = epic_timer; /* timer handler */ add_timer(&ep->timer); 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/smsc/epic100.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)