Message ID | 1506013525-29291-37-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="KCeoORjq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xykB86z11z9s3T for <patchwork-incoming@ozlabs.org>; Fri, 22 Sep 2017 03:29:20 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752698AbdIURJe (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Thu, 21 Sep 2017 13:09:34 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:36584 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752685AbdIURJb (ORCPT <rfc822;netdev@vger.kernel.org>); Thu, 21 Sep 2017 13:09:31 -0400 Received: by mail-pf0-f196.google.com with SMTP id f84so2720188pfj.3; Thu, 21 Sep 2017 10:09:30 -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=WUnoTpqDjriEP9mHk9D5YqwEmb/1DwjVtPmLBu9NOOc=; b=KCeoORjqVS+IPEuBZdnutW4X5JSdLI60oMu74jy0zBmes/4DyYTuXB5YXkkUALJylu jTxpux180hSKJGECjFPnQgwuuqDb8E3icuyD8x/wp8l4Bz7B0wZqDeQop07wKiTG9Gzf lNGN2OHIeozBO0PQ1OOozIUt2lZ88FZgsQZe2ZAGuVZQaeG3VDnF1iu7qZITyTWlt8D8 7tOOqbMCrPA084+2YnDm/kzFQ1/lLEeW9EJMH1ZCtSHWVhTrAsYjH5k7ed+WjAvrhzQQ iDii0nh5h1Jv7/1dDIGFTpzZY421sK1WB9hIMjD/++BdzOhm22FXRPQXp4ktqnQ1/947 N29w== 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=WUnoTpqDjriEP9mHk9D5YqwEmb/1DwjVtPmLBu9NOOc=; b=qVaEkzjyfU0M/tlDI73khkzJGh9T2pmUVf6PH+gyEGIiiePj42agJQUHjNKd/bavaM BZSNHOEW9uJZe/jbH3M8meQE/l+LOMOQq99EVugWSJGykMXmGPAGp3xcCGuYVHn4p9W/ ljPQ+ktwDgz428d287XIV27M3a2wdnz/pS1xrenw5UqQ7H64g0ajXjJ1ET/zfaYBWFgr vcF7hk2iRAgdK48WfNjg5DlZI+x6LlekDSjPdJoGylEkSY6T9obUGroWwO9BMRnffw2P i779AhFuEOSZum1czM3xn6uH3HUHWFcU5/iHM8qSooo5cOC/lx9rYnS9cilBYZo2VXUk HdWA== X-Gm-Message-State: AHPjjUjgOWFDb1lrhWk1PMTp3zO0tPvXDMO31NIxsGoDHynXhfLcWz2w 04TgKxSBUwxFzsloSCu90Ci3HxTZ X-Google-Smtp-Source: AOwi7QAdFEdVg607civT+tSF149bwm4QHr1Tuvk88ccjPtRQrQMPKhcf2V2hZtbUJLIGlAqerQZhqg== X-Received: by 10.99.126.84 with SMTP id o20mr6413982pgn.133.1506013770122; Thu, 21 Sep 2017 10:09:30 -0700 (PDT) Received: from localhost.localdomain ([103.42.74.194]) by smtp.gmail.com with ESMTPSA id p12sm3174090pgn.90.2017.09.21.10.09.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 10:09:29 -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 36/64] drivers: net: can: use setup_timer() helper. Date: Thu, 21 Sep 2017 22:34:57 +0530 Message-Id: <1506013525-29291-37-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/can/grcan.c b/drivers/net/can/grcan.c index a7be12d..8570cfd 100644 --- a/drivers/net/can/grcan.c +++ b/drivers/net/can/grcan.c @@ -1626,13 +1626,11 @@ static int grcan_setup_netdev(struct platform_device *ofdev, spin_lock_init(&priv->lock); if (priv->need_txbug_workaround) { - init_timer(&priv->rr_timer); - priv->rr_timer.function = grcan_running_reset; - priv->rr_timer.data = (unsigned long)dev; + setup_timer(&priv->rr_timer, grcan_running_reset, + (unsigned long)dev); - init_timer(&priv->hang_timer); - priv->hang_timer.function = grcan_initiate_running_reset; - priv->hang_timer.data = (unsigned long)dev; + setup_timer(&priv->hang_timer, grcan_initiate_running_reset, + (unsigned long)dev); } netif_napi_add(dev, &priv->napi, grcan_poll, GRCAN_NAPI_WEIGHT);
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/can/grcan.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)