Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2ae24cf authored Feb 07, 2008 by Anton Blanchard Committed by Linus Torvalds Feb 07, 2008

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>

parent 56e61a9c

drivers/edac/edac_device.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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,
	*/		*/
	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);

drivers/edac/edac_pci.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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);