diff options
author | Anton Blanchard <anton@samba.org> | 2008-02-07 03:14:51 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 11:42:23 -0500 |
commit | c2ae24cfd1969a28e76641807026a3bbc11c5f31 (patch) | |
tree | 4a78a505f8b61a2f404c335b59b6a4af31c51e9d /drivers/edac | |
parent | 56e61a9c5fe7b799504b125c278b56cc2c42670f (diff) |
drivers-edac: use round_jiffies_relative
When rounding a relative timeout we need to use round_jiffies_relative().
Signed-off-by: Anton Blanchard <anton@samba.org>
Acked-by: Arjan van de Ven <arjan@linux.intel.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk
Signed-off-by: Doug Thompson <dougthompson@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/edac')
-rw-r--r-- | drivers/edac/edac_device.c | 4 | ||||
-rw-r--r-- | drivers/edac/edac_pci.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c index 55d14d008dd6..b9552bc03dea 100644 --- a/drivers/edac/edac_device.c +++ b/drivers/edac/edac_device.c | |||
@@ -440,7 +440,7 @@ static void edac_device_workq_function(struct work_struct *work_req) | |||
440 | */ | 440 | */ |
441 | if (edac_dev->poll_msec == 1000) | 441 | if (edac_dev->poll_msec == 1000) |
442 | queue_delayed_work(edac_workqueue, &edac_dev->work, | 442 | queue_delayed_work(edac_workqueue, &edac_dev->work, |
443 | round_jiffies(edac_dev->delay)); | 443 | round_jiffies_relative(edac_dev->delay)); |
444 | else | 444 | else |
445 | queue_delayed_work(edac_workqueue, &edac_dev->work, | 445 | queue_delayed_work(edac_workqueue, &edac_dev->work, |
446 | edac_dev->delay); | 446 | edac_dev->delay); |
@@ -472,7 +472,7 @@ void edac_device_workq_setup(struct edac_device_ctl_info *edac_dev, | |||
472 | */ | 472 | */ |
473 | if (edac_dev->poll_msec == 1000) | 473 | if (edac_dev->poll_msec == 1000) |
474 | queue_delayed_work(edac_workqueue, &edac_dev->work, | 474 | queue_delayed_work(edac_workqueue, &edac_dev->work, |
475 | round_jiffies(edac_dev->delay)); | 475 | round_jiffies_relative(edac_dev->delay)); |
476 | else | 476 | else |
477 | queue_delayed_work(edac_workqueue, &edac_dev->work, | 477 | queue_delayed_work(edac_workqueue, &edac_dev->work, |
478 | edac_dev->delay); | 478 | edac_dev->delay); |
diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c index e0b47b74ec45..32be43576a8e 100644 --- a/drivers/edac/edac_pci.c +++ b/drivers/edac/edac_pci.c | |||
@@ -246,7 +246,7 @@ static void edac_pci_workq_function(struct work_struct *work_req) | |||
246 | /* if we are on a one second period, then use round */ | 246 | /* if we are on a one second period, then use round */ |
247 | msec = edac_pci_get_poll_msec(); | 247 | msec = edac_pci_get_poll_msec(); |
248 | if (msec == 1000) | 248 | if (msec == 1000) |
249 | delay = round_jiffies(msecs_to_jiffies(msec)); | 249 | delay = round_jiffies_relative(msecs_to_jiffies(msec)); |
250 | else | 250 | else |
251 | delay = msecs_to_jiffies(msec); | 251 | delay = msecs_to_jiffies(msec); |
252 | 252 | ||