[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1506013525-29291-52-git-send-email-allen.lkml@gmail.com>
Date: Thu, 21 Sep 2017 22:35:12 +0530
From: Allen Pais <allen.lkml@...il.com>
To: netdev@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, m.grzeschik@...gutronix.de,
dmitry.tarnyagin@...kless.no, wg@...ndegger.com,
mkl@...gutronix.de, mark.einon@...il.com, linux@...linux.org.uk,
pcnet32@...ntier.com, f.fainelli@...il.com,
bcm-kernel-feedback-list@...adcom.com, venza@...wnhat.org,
ajk@...nets.uni-bremen.de, jes@...ined-monkey.org,
romieu@...zoreil.com, khc@...waw.pl, simon@...kelleys.org.uk,
davem@...emloft.net, linux-can@...r.kernel.org,
adi-buildroot-devel@...ts.sourceforge.net,
Allen Pais <allen.lkml@...il.com>
Subject: [PATCH 51/64] drivers: net: caif: use setup_timer() helper.
Use setup_timer function instead of initializing timer with the
function and data fields.
Signed-off-by: Allen Pais <allen.lkml@...il.com>
---
drivers/net/caif/caif_hsi.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
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);
--
2.7.4
Powered by blists - more mailing lists