Message ID | 1506013525-29291-33-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="Icozp9zK"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xykCG2zyHz9sRq for <patchwork-incoming@ozlabs.org>; Fri, 22 Sep 2017 03:30:18 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752618AbdIURJI (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Thu, 21 Sep 2017 13:09:08 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34812 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751826AbdIURJF (ORCPT <rfc822;netdev@vger.kernel.org>); Thu, 21 Sep 2017 13:09:05 -0400 Received: by mail-pf0-f193.google.com with SMTP id g65so2722762pfe.1; Thu, 21 Sep 2017 10:09:05 -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=NNuTVmz4gODYqT1SCOa5To7KYrG3oKi4IGeQPgI53A0=; b=Icozp9zKQfjlRY4Se3Ew+00beT3EkB2m2cMs2089nRTNFgtWlcbtMex9TBRWdvtPTz UtHb0syJNLnVEw1x2LDuZjhQDQBbGdUcva3IjQoszAdX86Zv6ujx1fyyVNBDP9NGBpty j+l5DjY8Rus/I/Mg94A82kSKILyOIz2lF4HwwmAFkgNyi4zfDWfxbjejqyjKmyZVraW6 hMsy9vWdHiefBEaZg3UdpRnJ9cm5sDgNtsvd258d9LcA8e8ABAbp4Jkf8nPBhjve5LRw 0YFI4iUq6X572i5HglP1jgrv2smwGfSRYv53FUWvhvhRgeGXnyLnxW4eL2Y8U1wSF/Wf rTMQ== 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=NNuTVmz4gODYqT1SCOa5To7KYrG3oKi4IGeQPgI53A0=; b=sJcdG/xMcHRw+uxT+bxO7gXq6+qx22Mf2EF7iUh2c4urlqAbXuELd5amfRTgQtuQO2 Z45LFFym65j79Ck6L310vddOTEMB+io31aLTOoi8DQH3P6f1Quy+b6ndnjIjAIpLyu2H vQXmN8TiidU/P/ZY0bwkhb/vWFj7Voe5WAA13vyETlGt9SA/OCSM1cQGubABDql+lqvl JhzPxXRdWmZNvyubRZk1tk390pmnuKiluPpk/yduSOtyMVn1tfFTxmfA0Pr2t4VLxrtl MKXB6FD4/PNpKbKL+focDZmC0x+q+AagKISJZU3U8e5Q3u78pyZLtwRwfSVsy5+bLLAj ideg== X-Gm-Message-State: AHPjjUi6JoeIkL00okewetjwu40EseLFYBGRnKK2MFMRMERI66/76z3j asgQw3wnjmhl7PDIa78vSVCnUhlw X-Google-Smtp-Source: AOwi7QDDcY8JZ4HfyWr4qc3SS6Nnbe4ZGRvO20yfJSHcQYCXOFIrXNflh7p4KU1Ehkw0g31Ozcsr8A== X-Received: by 10.84.234.140 with SMTP id n12mr6250245plk.209.1506013744626; Thu, 21 Sep 2017 10:09:04 -0700 (PDT) Received: from localhost.localdomain ([103.42.74.194]) by smtp.gmail.com with ESMTPSA id p12sm3174090pgn.90.2017.09.21.10.08.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 10:09:03 -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 32/64] drivers: net: amd: use setup_timer() helper. Date: Thu, 21 Sep 2017 22:34:53 +0530 Message-Id: <1506013525-29291-33-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/amd/sunlance.c b/drivers/net/ethernet/amd/sunlance.c index 291ca51..0183ffb 100644 --- a/drivers/net/ethernet/amd/sunlance.c +++ b/drivers/net/ethernet/amd/sunlance.c @@ -1459,9 +1459,8 @@ static int sparc_lance_probe_one(struct platform_device *op, * can occur from interrupts (ex. IPv6). So we * use a timer to try again later when necessary. -DaveM */ - init_timer(&lp->multicast_timer); - lp->multicast_timer.data = (unsigned long) dev; - lp->multicast_timer.function = lance_set_multicast_retry; + setup_timer(&lp->multicast_timer, lance_set_multicast_retry, + (unsigned long)dev); if (register_netdev(dev)) { printk(KERN_ERR "SunLance: Cannot register device.\n");
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/amd/sunlance.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)