Commit 72046d84 authored by Breno Leitao's avatar Breno Leitao Committed by David S. Miller

qlge: Replacing add_timer() to mod_timer()

Currently qlge driver calls add_timer() instead of mod_timer().
This patch changes add_timer() to mod_timer(), which seems a better
solution.
Signed-off-by: default avatarBreno Leitao <leitao@linux.vnet.ibm.com>
Signed-off-by: default avatarRon Mercer <ron.mercer@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0dacca73
...@@ -4611,8 +4611,7 @@ static void ql_timer(unsigned long data) ...@@ -4611,8 +4611,7 @@ static void ql_timer(unsigned long data)
return; return;
} }
qdev->timer.expires = jiffies + (5*HZ); mod_timer(&qdev->timer, jiffies + (5*HZ));
add_timer(&qdev->timer);
} }
static int __devinit qlge_probe(struct pci_dev *pdev, static int __devinit qlge_probe(struct pci_dev *pdev,
...@@ -4808,8 +4807,7 @@ static void qlge_io_resume(struct pci_dev *pdev) ...@@ -4808,8 +4807,7 @@ static void qlge_io_resume(struct pci_dev *pdev)
netif_err(qdev, ifup, qdev->ndev, netif_err(qdev, ifup, qdev->ndev,
"Device was not running prior to EEH.\n"); "Device was not running prior to EEH.\n");
} }
qdev->timer.expires = jiffies + (5*HZ); mod_timer(&qdev->timer, jiffies + (5*HZ));
add_timer(&qdev->timer);
netif_device_attach(ndev); netif_device_attach(ndev);
} }
...@@ -4871,8 +4869,7 @@ static int qlge_resume(struct pci_dev *pdev) ...@@ -4871,8 +4869,7 @@ static int qlge_resume(struct pci_dev *pdev)
return err; return err;
} }
qdev->timer.expires = jiffies + (5*HZ); mod_timer(&qdev->timer, jiffies + (5*HZ));
add_timer(&qdev->timer);
netif_device_attach(ndev); netif_device_attach(ndev);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment