serial/68360serial: replace schedule_timeout() with msleep_interruptible()
PATCH 5/8 serial/68360serial: 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.
Signed-off-by Nishanth Aravamudan <[email protected]>
Signed-off-by Maximilian Attems <[email protected]>
---
linux-2.6.10-rc1-max/drivers/serial/68360serial.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-)
drivers/serial/68360serial.c renamed from drivers/serial/68360serial.c~msleep_interruptible-drivers_serial_68360serial +3 -5
@@ -1396,7 +1396,7 @@ static void end_break(ser_info_t *info)*/ static void send_break (ser_info_t *info,int duration) { - current->state =TASK_INTERRUPTIBLE ; +set_current_state (TASK_INTERRUPTIBLE );#ifdef SERIAL_DEBUG_SEND_BREAK printk ("rs_send_break(%d) jiff=%lu..." , duration, jiffies);#endif
@@ -1707,8 +1707,7 @@ static void rs_360_close(struct tty_stru info->tty =0 ;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); }
@@ -1761,9 +1760,8 @@ static void rs_360_wait_until_sent(struc#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT printk ("lsr = %d (jiff=%lu)..." , lsr, jiffies);#endif - current->state =TASK_INTERRUPTIBLE ;/* current->counter = 0; make us low-priority */ -schedule_timeout (char_time); +msleep_interruptible (jiffies_to_msecs (char_time));if (signal_pending (current))break ;if (timeout && ((orig_jiffies + timeout) < jiffies))
_
Russell King
AppliedQuoted 1 line · On Sun, Oct 31, 2004 at 12:47:12AM +0200, [email protected] wrote:
Any comments would be appreciated.
Applied.
Signature · 4 lines
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