Commit c2ae24cf authored by Anton Blanchard's avatar Anton Blanchard Committed by Linus Torvalds

drivers-edac: use round_jiffies_relative

When rounding a relative timeout we need to use round_jiffies_relative().
Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Acked-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk
Signed-off-by: default avatarDoug Thompson <dougthompson@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 56e61a9c
...@@ -440,7 +440,7 @@ static void edac_device_workq_function(struct work_struct *work_req) ...@@ -440,7 +440,7 @@ static void edac_device_workq_function(struct work_struct *work_req)
*/ */
if (edac_dev->poll_msec == 1000) if (edac_dev->poll_msec == 1000)
queue_delayed_work(edac_workqueue, &edac_dev->work, queue_delayed_work(edac_workqueue, &edac_dev->work,
round_jiffies(edac_dev->delay)); round_jiffies_relative(edac_dev->delay));
else else
queue_delayed_work(edac_workqueue, &edac_dev->work, queue_delayed_work(edac_workqueue, &edac_dev->work,
edac_dev->delay); edac_dev->delay);
...@@ -472,7 +472,7 @@ void edac_device_workq_setup(struct edac_device_ctl_info *edac_dev, ...@@ -472,7 +472,7 @@ void edac_device_workq_setup(struct edac_device_ctl_info *edac_dev,
*/ */
if (edac_dev->poll_msec == 1000) if (edac_dev->poll_msec == 1000)
queue_delayed_work(edac_workqueue, &edac_dev->work, queue_delayed_work(edac_workqueue, &edac_dev->work,
round_jiffies(edac_dev->delay)); round_jiffies_relative(edac_dev->delay));
else else
queue_delayed_work(edac_workqueue, &edac_dev->work, queue_delayed_work(edac_workqueue, &edac_dev->work,
edac_dev->delay); edac_dev->delay);
......
...@@ -246,7 +246,7 @@ static void edac_pci_workq_function(struct work_struct *work_req) ...@@ -246,7 +246,7 @@ static void edac_pci_workq_function(struct work_struct *work_req)
/* if we are on a one second period, then use round */ /* if we are on a one second period, then use round */
msec = edac_pci_get_poll_msec(); msec = edac_pci_get_poll_msec();
if (msec == 1000) if (msec == 1000)
delay = round_jiffies(msecs_to_jiffies(msec)); delay = round_jiffies_relative(msecs_to_jiffies(msec));
else else
delay = msecs_to_jiffies(msec); delay = msecs_to_jiffies(msec);
......
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