[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1506013525-29291-31-git-send-email-allen.lkml@gmail.com>
Date: Thu, 21 Sep 2017 22:34:51 +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 30/64] drivers: net: qlogic: 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/qlogic/qla3xxx.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c
index 2991179..05479d4 100644
--- a/drivers/net/ethernet/qlogic/qla3xxx.c
+++ b/drivers/net/ethernet/qlogic/qla3xxx.c
@@ -3891,10 +3891,8 @@ static int ql3xxx_probe(struct pci_dev *pdev,
INIT_DELAYED_WORK(&qdev->tx_timeout_work, ql_tx_timeout_work);
INIT_DELAYED_WORK(&qdev->link_state_work, ql_link_state_machine_work);
- init_timer(&qdev->adapter_timer);
- qdev->adapter_timer.function = ql3xxx_timer;
+ setup_timer(&qdev->adapter_timer, ql3xxx_timer, (unsigned long)qdev);
qdev->adapter_timer.expires = jiffies + HZ * 2; /* two second delay */
- qdev->adapter_timer.data = (unsigned long)qdev;
if (!cards_found) {
pr_alert("%s\n", DRV_STRING);
--
2.7.4
Powered by blists - more mailing lists