2004-10-30 22:49:58

by maximilian attems

Subject: [patch 6/8] serial/mcfserial: replace schedule_timeout() with msleep_interruptible()

Any comments would be appreciated.

Description: Use msleep_interruptible() instead of schedule_timeout() to
guarantee the task delays as expected. Use set_current_state() instead
of direct assignment of current->state.

Acked-by: Greg Ungerer <[email protected]>

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

linux-2.6.10-rc1-max/drivers/serial/mcfserial.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)

diff -puN drivers/serial/mcfserial.c~msleep_interruptible-drivers_serial_mcfserial drivers/serial/mcfserial.c
--- linux-2.6.10-rc1/drivers/serial/mcfserial.c~msleep_interruptible-drivers_serial_mcfserial 2004-10-24 17:05:29.000000000 +0200
+++ linux-2.6.10-rc1-max/drivers/serial/mcfserial.c 2004-10-24 17:05:29.000000000 +0200
@@ -35,6 +35,7 @@
#include <linux/console.h>
#include <linux/init.h>
#include <linux/bitops.h>
+#include <linux/delay.h>

#include <asm/io.h>
#include <asm/irq.h>
@@ -978,7 +979,7 @@ static void send_break( struct mcf_seria

if (!info->addr)
return;
- current->state = TASK_INTERRUPTIBLE;
+ set_current_state(TASK_INTERRUPTIBLE);
uartp = info->addr;

local_irq_save(flags);
@@ -1230,8 +1231,7 @@ static void mcfrs_close(struct tty_struc
#endif
if (info->blocked_open) {
if (info->close_delay) {
- current->state = TASK_INTERRUPTIBLE;
- schedule_timeout(info->close_delay);
+ msleep_interruptible(jiffies_to_msecs(info->close_delay));
}
wake_up_interruptible(&info->open_wait);
}
@@ -1296,8 +1296,7 @@ mcfrs_wait_until_sent(struct tty_struct
fifo_cnt++;
if (fifo_cnt == 0)
break;
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(char_time);
+ msleep_interruptible(jiffies_to_msecs(char_time));
if (signal_pending(current))
break;
if (timeout && time_after(jiffies, orig_jiffies + timeout))
_

2004-11-01 12:43:10

by Russell King

Subject: Re: [patch 6/8] serial/mcfserial: replace schedule_timeout() with msleep_interruptible()

On Sun, Oct 31, 2004 at 12:47:16AM +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