[patch 4/8] serial/68328serial: replace schedule_timeout() with msleep_interruptible()

[patch 4/8] serial/68328serial: replace schedule_timeout() with msleep_interruptible()

[janitor]

Any comments would be appreciated.

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

Acked-by: David McCullough <davidm@snapgear.com>

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
---

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

diff -puN drivers/serial/68328serial.c~msleep_interruptible-drivers_serial_68328serial drivers/serial/68328serial.c
--- linux-2.6.10-rc1/drivers/serial/68328serial.c~msleep_interruptible-drivers_serial_68328serial	2004-10-24 17:05:28.000000000 +0200
+++ linux-2.6.10-rc1-max/drivers/serial/68328serial.c	2004-10-24 17:05:28.000000000 +0200
@@ -35,6 +35,7 @@
 #include <linux/init.h>
 #include <linux/pm.h>
 #include <linux/bitops.h>
+#include <linux/delay.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -997,7 +998,7 @@ static void send_break(	struct m68k_seri
         unsigned long flags;
         if (!info->port)
                 return;
-        current->state = TASK_INTERRUPTIBLE;
+        set_current_state(TASK_INTERRUPTIBLE);
         save_flags(flags);
         cli();
 #ifdef USE_INTS	
@@ -1189,8 +1190,7 @@ static void rs_close(struct tty_struct *
 #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);
 	}
_

Re: [patch 4/8] serial/68328serial: replace schedule_timeout() with msleep_interruptible()

[Russell King]

On Sun, Oct 31, 2004 at 12:47:09AM +0200, janitor@sternwelten.at 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