aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/qlogic/qla3xxx.c
diff options
context:
space:
mode:
authorAllen Pais <allen.lkml@gmail.com>2017-09-21 22:34:51 +0530
committerDavid S. Miller <davem@davemloft.net>2017-09-21 11:44:41 -0700
commitd4d8db71db1bf602623e859e6c3e700b604c2072 (patch)
tree054b1697a917416ec559ca1f76648473dc5d8c20 /drivers/net/ethernet/qlogic/qla3xxx.c
parentdrivers: net: smsc: use setup_timer() helper. (diff)
downloadlinux-dev-d4d8db71db1bf602623e859e6c3e700b604c2072.tar.xz
linux-dev-d4d8db71db1bf602623e859e6c3e700b604c2072.zip
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@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic/qla3xxx.c')
-rw-r--r--drivers/net/ethernet/qlogic/qla3xxx.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c
index 2991179c2fd0..05479d435469 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);