char/synclink: replace
Subsystems (2)
PATCH 28/33 char/synclink: replace
Any comments would be appreciated.
Description: Use msleep_interruptible() instead of schedule_timeout() to guarantee the task delays as expected.
Signed-off-by Nishanth Aravamudan <[email protected]>
drivers/char/synclink.c +5 -8
@@ -82,6 +82,7 @@#include <linux/ioport.h> #include <linux/mm.h> #include <linux/slab.h> +#include <linux/delay.h> #include <linux/netdevice.h>
@@ -3246,8 +3247,7 @@ static void mgsl_close(struct tty_structif (info->blocked_open) {if (info->close_delay) { -set_current_state (TASK_INTERRUPTIBLE ); -schedule_timeout (info->close_delay); +msleep_interruptible (jiffies_to_msecs (info->close_delay)); }wake_up_interruptible (&info->open_wait); }
@@ -3313,8 +3313,7 @@ static void mgsl_wait_until_sent(structif ( info->params.mode ==MGSL_MODE_HDLC || info->params.mode ==MGSL_MODE_RAW ) {while (info->tx_active) { -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))
@@ -3323,8 +3322,7 @@ static void mgsl_wait_until_sent(struct }else {while (!(usc_InReg (info,TCSR ) &TXSTATUS_ALL_SENT ) && info->tx_enabled) { -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))
@@ -7193,8 +7191,7 @@ BOOLEAN mgsl_irq_test( struct mgsl_struc EndTime=100 ;while ( EndTime-- && !info->irq_occurred ) { -set_current_state (TASK_INTERRUPTIBLE ); -schedule_timeout (msecs_to_jiffies (10 )); +msleep_interruptible (10 ); }spin_lock_irqsave (&info->irq_spinlock,flags);
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors