Message ID | 1506013525-29291-52-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="KeycH/Xo"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xyjz82n0fz9t49 for <patchwork-incoming@ozlabs.org>; Fri, 22 Sep 2017 03:19:48 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753020AbdIURLJ (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Thu, 21 Sep 2017 13:11:09 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:36972 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752441AbdIURLG (ORCPT <rfc822;netdev@vger.kernel.org>); Thu, 21 Sep 2017 13:11:06 -0400 Received: by mail-pf0-f194.google.com with SMTP id e69so2715485pfg.4; Thu, 21 Sep 2017 10:11: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=5FqrShsIO7lSImMM9gaedGQPb17ewGqQnR2vGbZPUVs=; b=KeycH/XorYHOdqx0wrk0TFUuqn4YkOa0HqgFhRzDEpmllFMldC3CxvP6IuFOJT/0mV 9J+LQJtT2fMx9YaYeiYVkcsIqSMvauOYA21fawtG0rZLFgL2sa+aZJ1vtVF85NUc3HhV 85pj2HE4q0iTMAKwZmR+lxaboXbMIIURCfG2sSx7q/9hiBZjj2PDQKKTAr71xutqg9pI EsNJGXrCMTpiiY0UDdm/gnZ9RfcOJgW+UxkdymP43DvAzdL6/lnlL17amOuhbsdiVMKq y3XY8ziTklZkcvJg9CXgozTzxIeJ9sNOBIRmWLjFxLlmqjPQc7p+58ANFoXIli5ctZZz bYRg== 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=5FqrShsIO7lSImMM9gaedGQPb17ewGqQnR2vGbZPUVs=; b=WT0xcGv3t03R7rX5xHKwcG/lkiMhaV26ESfHHjAdbXeb36SmquKN7wUoQTrvXAqh81 6AXc/O0YlbMKrNodqKzvB/dNco4E0ZvkIcYWMnkxQSdMYfKdtJlRsvoZr1wWZiRmYolk W4lJDQaN3Z2jpTvaBQk+80K/nCSaeGGqAEx6dHTEa/b+A4CCpkerveFv/PsHI66d5GGN eWfJ3KOnZym0a9M6v+j2FI2XTriNc1MEJXIcFcOvtlJCkNjXmK28wqt4u4QAZHYQRH/x 1pMwXCkJxL8JRCZkjS0S4w3PHG4D83zLSR+LORjDM3wi9px+Lh1lATdn127h9JO1XEV2 O/zw== X-Gm-Message-State: AHPjjUjBUOrxoxF8kTJV3G/C2B2i5IwvPEMhog0xuPyKQTpud2bVFTK7 16mNMUi6jZk8QcGCRetHgmY229Lh X-Google-Smtp-Source: AOwi7QCZpEIrPYvlGRuWRkCSJOMqhgrG7/lvFj7EYu9csz+gdaw2QBdY0esdfJtvilr/ydTZs9clfg== X-Received: by 10.98.78.203 with SMTP id c194mr6426085pfb.152.1506013865084; Thu, 21 Sep 2017 10:11:05 -0700 (PDT) Received: from localhost.localdomain ([103.42.74.194]) by smtp.gmail.com with ESMTPSA id p12sm3174090pgn.90.2017.09.21.10.10.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 10:11:04 -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 51/64] drivers: net: caif: use setup_timer() helper. Date: Thu, 21 Sep 2017 22:35:12 +0530 Message-Id: <1506013525-29291-52-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/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c index 438966b..fed75e7 100644 --- a/drivers/net/caif/caif_hsi.c +++ b/drivers/net/caif/caif_hsi.c @@ -1211,17 +1211,14 @@ static int cfhsi_open(struct net_device *ndev) init_waitqueue_head(&cfhsi->flush_fifo_wait); /* Setup the inactivity timer. */ - init_timer(&cfhsi->inactivity_timer); - cfhsi->inactivity_timer.data = (unsigned long)cfhsi; - cfhsi->inactivity_timer.function = cfhsi_inactivity_tout; + setup_timer(&cfhsi->inactivity_timer, cfhsi_inactivity_tout, + (unsigned long)cfhsi); /* Setup the slowpath RX timer. */ - init_timer(&cfhsi->rx_slowpath_timer); - cfhsi->rx_slowpath_timer.data = (unsigned long)cfhsi; - cfhsi->rx_slowpath_timer.function = cfhsi_rx_slowpath; + setup_timer(&cfhsi->rx_slowpath_timer, cfhsi_rx_slowpath, + (unsigned long)cfhsi); /* Setup the aggregation timer. */ - init_timer(&cfhsi->aggregation_timer); - cfhsi->aggregation_timer.data = (unsigned long)cfhsi; - cfhsi->aggregation_timer.function = cfhsi_aggregation_tout; + setup_timer(&cfhsi->aggregation_timer, cfhsi_aggregation_tout, + (unsigned long)cfhsi); /* Activate HSI interface. */ res = cfhsi->ops->cfhsi_up(cfhsi->ops);
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/caif/caif_hsi.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)