[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1506013525-29291-60-git-send-email-allen.lkml@gmail.com>
Date: Thu, 21 Sep 2017 22:35:20 +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 59/64] drivers: net: i40evf: 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/ethernet/intel/i40evf/i40evf_main.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 1825d95..c243f9d 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -2686,9 +2686,8 @@ static void i40evf_init_task(struct work_struct *work)
ether_addr_copy(netdev->perm_addr, adapter->hw.mac.addr);
}
- init_timer(&adapter->watchdog_timer);
- adapter->watchdog_timer.function = &i40evf_watchdog_timer;
- adapter->watchdog_timer.data = (unsigned long)adapter;
+ setup_timer(&adapter->watchdog_timer, &i40evf_watchdog_timer,
+ (unsigned long)adapter);
mod_timer(&adapter->watchdog_timer, jiffies + 1);
adapter->tx_desc_count = I40EVF_DEFAULT_TXD;
--
2.7.4
Powered by blists - more mailing lists