From patchwork Thu Sep 21 17:04:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen X-Patchwork-Id: 817134 X-Patchwork-Delegate: davem@davemloft.net Return-Path: 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=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IyLJWcAz"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xykP64s2Lz9s3T for ; Fri, 22 Sep 2017 03:38:50 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751846AbdIURGD (ORCPT ); Thu, 21 Sep 2017 13:06:03 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:35337 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751787AbdIURGB (ORCPT ); Thu, 21 Sep 2017 13:06:01 -0400 Received: by mail-pg0-f65.google.com with SMTP id j16so3743214pga.2; Thu, 21 Sep 2017 10:06:00 -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=mf5GUXwd056ObFNWRko2OsgEcApKF0212LP95f5HCg0=; b=IyLJWcAz6NRnICW2mRnWB7cr1qHhkOqQBa+7+Tr76nYyI5SjM0gKQeaip7ijZcuzG5 hwoxmhUc2rufKWiMZr2DB5vBLOuNm0YRBW5pDfjo7F7kd6tyQkacXlTjoeXqBsy7LR8w icTIwv5g/ElYQhfRiwmTcVsrVqNatOE0P6xz0WV5qWC6d4wrwZkkaEuL9GXzbskHYX1V HZMBqSNAH0NZdk5m3+6+a8e+1QStoZK3kjF6madxBqoxxXiveHTFli1fgSHHcdwCg+e6 oXsSaBN3KE5TjL8eAore7DEnVPSSXZnBVrqRUvumrZ0/XllsOcZzetSmjBooEUbOSu2d dlGQ== 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=mf5GUXwd056ObFNWRko2OsgEcApKF0212LP95f5HCg0=; b=kLtpefb70yYTIHZRiO2Q6eq7eYg+CFNc+jXrHjAKeWViLfuX9asnz/ediIXJJ1Hlez 5zMJ2K0DnwV9OCqCb1HluSAwsOKVuST52w3IvPIUIIep1T2Tmp7SvlrC9eq0kikv4+sF Gf66HStrDI2TZinyQszI6z3wp7T2/QqzO8/fIYClb7T4//WWd3673don43Kusk5XKBQ4 mRk+Gq1JxkGUese4t2tvJRoRilK1hFjpovq6oWF7UglVf8LHaQAJHFgT11pooUUL61g/ 3LbKbVdn9U+1sKHjfjTRoqabYpiflka4UZAk57a3/vJB6pHEvT+dozPnz85zkd1Qt70a bVKA== X-Gm-Message-State: AHPjjUjCLcf+NUDL3WDqooDM0MLFoDOQ4NbB6xgmN73JXA3R2wV0RLQW UuG/nB2TasRsEm0nhO5b/fMf+60BsGY= X-Google-Smtp-Source: AOwi7QDohUevIWJVQUQWqGr4H+yDRT0HzJLmLtxwtiEqqeDMw58eMZXdjSISxOJj59xPmyKj0HlPJg== X-Received: by 10.84.234.140 with SMTP id n12mr6241533plk.209.1506013560239; Thu, 21 Sep 2017 10:06:00 -0700 (PDT) Received: from localhost.localdomain ([103.42.74.194]) by smtp.gmail.com with ESMTPSA id p12sm3174090pgn.90.2017.09.21.10.05.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 10:05:59 -0700 (PDT) From: Allen Pais 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 Subject: [PATCH 03/64] drivers: net: pcnet32: use setup_timer() helper. Date: Thu, 21 Sep 2017 22:34:24 +0530 Message-Id: <1506013525-29291-4-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: X-Mailing-List: netdev@vger.kernel.org Use setup_timer function instead of initializing timer with the function and data fields. Signed-off-by: Allen Pais --- drivers/net/ethernet/amd/pcnet32.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c index 7f60d17..e461536 100644 --- a/drivers/net/ethernet/amd/pcnet32.c +++ b/drivers/net/ethernet/amd/pcnet32.c @@ -1970,9 +1970,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) lp->options |= PCNET32_PORT_MII; } - init_timer(&lp->watchdog_timer); - lp->watchdog_timer.data = (unsigned long)dev; - lp->watchdog_timer.function = (void *)&pcnet32_watchdog; + setup_timer(&lp->watchdog_timer, (void *)&pcnet32_watchdog, + (unsigned long)dev); /* The PCNET32-specific entries in the device structure. */ dev->netdev_ops = &pcnet32_netdev_ops;