2004-10-30 22:52:52

by maximilian attems

Subject: [patch 3/8] serial/pmac_zilog: replace schedule_timeout() with msleep()

Any comments would be appreciated.

Description: Use msleep() instead of schedule_timeout() to
guarantee the task delays as expected.

Signed-off-by: Maximilian Attems <[email protected]>
---

linux-2.6.10-rc1-max/drivers/serial/pmac_zilog.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)

diff -puN drivers/serial/pmac_zilog.c~msleep-drivers_serial_pmac_zilog drivers/serial/pmac_zilog.c
--- linux-2.6.10-rc1/drivers/serial/pmac_zilog.c~msleep-drivers_serial_pmac_zilog 2004-10-24 17:05:09.000000000 +0200
+++ linux-2.6.10-rc1-max/drivers/serial/pmac_zilog.c 2004-10-24 17:05:09.000000000 +0200
@@ -949,8 +949,7 @@ static int pmz_startup(struct uart_port
*/
if (pwr_delay != 0) {
pmz_debug("pmz: delaying %d ms\n", pwr_delay);
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout((pwr_delay * HZ)/1000);
+ msleep(pwr_delay);
}

/* IrDA reset is done now */
@@ -1684,8 +1683,7 @@ static int pmz_resume(struct macio_dev *
*/
if (pwr_delay != 0) {
pmz_debug("pmz: delaying %d ms\n", pwr_delay);
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout((pwr_delay * HZ)/1000);
+ msleep(pwr_delay);
}

pmz_debug("resume, switching complete\n");
_

2004-11-01 12:36:43

by Russell King

Subject: Re: [patch 3/8] serial/pmac_zilog: replace schedule_timeout() with msleep()

On Sun, Oct 31, 2004 at 12:47:05AM +0200, [email protected] wrote:
> Any comments would be appreciated.

Applied.

--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core