[PATCH] drivers/char: replace schedule_timeout() with msleep_interruptible()

Replace lots of open-coded sleeps with msleep_interruptible() under
drivers/char.

Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Rogier Wolff <R.E.Wolff@BitWizard.nl>
Signed-off-by: Christoph Lameter <christoph@lameter.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index f11cf4ea03983125fecda147baa75a3dd661587f..2355455786f430e286c186feb5150fbc38b45330 100644 (file)
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -32,6 +32,7 @@
  */
 
 #include <linux/config.h>
+#include <linux/delay.h>
 
 #undef SERIAL_PARANOIA_CHECK
 #define SERIAL_DO_RESTART
@@ -1563,8 +1564,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
        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);
        }
@@ -1622,8 +1622,7 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
 #ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
                printk("serdatr = %d (jiff=%lu)...", lsr, jiffies);
 #endif
-               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))

diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index 6ceaee64b2697f00286642cdf4cee2aae2d7eb4e..46002d5bada15d90490a4906f3a40ecae749a0a1 100644 (file)
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -2690,20 +2690,16 @@ cy_wait_until_sent(struct tty_struct *tty, int timeout)
 #ifdef CY_DEBUG_WAIT_UNTIL_SENT
            printk("Not clean (jiff=%lu)...", jiffies);
 #endif
-           current->state = TASK_INTERRUPTIBLE;
-           schedule_timeout(char_time);
-           if (signal_pending(current))
+           if (msleep_interruptible(jiffies_to_msecs(char_time)))
                break;
            if (timeout && time_after(jiffies, orig_jiffies + timeout))
                break;
        }
-       current->state = TASK_RUNNING;
     } else {
        // Nothing to do!
     }
     /* Run one more char cycle */
-    current->state = TASK_INTERRUPTIBLE;
-    schedule_timeout(char_time * 5);
+    msleep_interruptible(jiffies_to_msecs(char_time * 5));
 #ifdef CY_DEBUG_WAIT_UNTIL_SENT
     printk("Clean (jiff=%lu)...done\n", jiffies);
 #endif
@@ -2828,8 +2824,7 @@ cy_close(struct tty_struct *tty, struct file *filp)
     if (info->blocked_open) {
        CY_UNLOCK(info, flags);
         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);
        CY_LOCK(info, flags);

diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c
index e8f15f46eca43b9d552f8733a5f3e02fadef2a46..903e4c3cc20914aad2b8fe8aec8796b57a70dc8b 100644 (file)
--- a/drivers/char/dtlk.c
+++ b/drivers/char/dtlk.c
@@ -107,7 +107,6 @@ static struct file_operations dtlk_fops =
 };
 
 /* local prototypes */
-static void dtlk_delay(int ms);
 static int dtlk_dev_probe(void);
 static struct dtlk_settings *dtlk_interrogate(void);
 static int dtlk_readable(void);
@@ -146,7 +145,7 @@ static ssize_t dtlk_read(struct file *file, char __user *buf,
                        return i;
                if (file->f_flags & O_NONBLOCK)
                        break;
-               dtlk_delay(100);
+               msleep_interruptible(100);
        }
        if (retries == loops_per_jiffy)
                printk(KERN_ERR "dtlk_read times out\n");
@@ -191,7 +190,7 @@ static ssize_t dtlk_write(struct file *file, const char __user *buf,
                                   rate to 500 bytes/sec, but that's
                                   still enough to keep up with the
                                   speech synthesizer. */
-                               dtlk_delay(1);
+                               msleep_interruptible(1);
                        else {
                                /* the RDY bit goes zero 2-3 usec
                                   after writing, and goes 1 again
@@ -212,7 +211,7 @@ static ssize_t dtlk_write(struct file *file, const char __user *buf,
                if (file->f_flags & O_NONBLOCK)
                        break;
 
-               dtlk_delay(1);
+               msleep_interruptible(1);
 
                if (++retries > 10 * HZ) { /* wait no more than 10 sec
                                              from last write */
@@ -351,8 +350,7 @@ static int __init dtlk_init(void)
 static void __exit dtlk_cleanup (void)
 {
        dtlk_write_bytes("goodbye", 8);
-       current->state = TASK_INTERRUPTIBLE;
-       schedule_timeout(5 * HZ / 10);          /* nap 0.50 sec but
+       msleep_interruptible(500);              /* nap 0.50 sec but
                                                   could be awakened
                                                   earlier by
                                                   signals... */
@@ -368,13 +366,6 @@ module_exit(dtlk_cleanup);
 
 /* ------------------------------------------------------------------------ */
 
-/* sleep for ms milliseconds */
-static void dtlk_delay(int ms)
-{
-       current->state = TASK_INTERRUPTIBLE;
-       schedule_timeout((ms * HZ + 1000 - HZ) / 1000);
-}
-
 static int dtlk_readable(void)
 {
 #ifdef TRACING
@@ -431,7 +422,7 @@ static int __init dtlk_dev_probe(void)
                        /* posting an index takes 18 msec.  Here, we
                           wait up to 100 msec to see whether it
                           appears. */
-                       dtlk_delay(100);
+                       msleep_interruptible(100);
                        dtlk_has_indexing = dtlk_readable();
 #ifdef TRACING
                        printk(", indexing %d\n", dtlk_has_indexing);

diff --git a/drivers/char/epca.c b/drivers/char/epca.c
index 0f13bef975f51634fac1f367134a670d95437109..4b1e0b38cd8c570b70f85a99d723673c66a6ee3b 100644 (file)
--- a/drivers/char/epca.c
+++ b/drivers/char/epca.c
@@ -561,8 +561,7 @@ static void pc_close(struct tty_struct * tty, struct file * filp)
 
                        if (ch->close_delay) 
                        {
-                               current->state = TASK_INTERRUPTIBLE;
-                               schedule_timeout(ch->close_delay);
+                               msleep_interruptible(jiffies_to_msecs(ch->close_delay));
                        }
 
                        wake_up_interruptible(&ch->open_wait);

diff --git a/drivers/char/esp.c b/drivers/char/esp.c
index d67098c45ffd4d8d0b0d84ac84bcdad2fc7b818c..19d17b0ef5e003ad4fa068a2942c9202f7b98b1e 100644 (file)
--- a/drivers/char/esp.c
+++ b/drivers/char/esp.c
@@ -57,6 +57,7 @@
 #include <linux/ioport.h>
 #include <linux/mm.h>
 #include <linux/init.h>
+#include <linux/delay.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
@@ -2066,8 +2067,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
 
        if (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);
        }
@@ -2098,8 +2098,7 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
 
        while ((serial_in(info, UART_ESI_STAT1) != 0x03) ||
                (serial_in(info, UART_ESI_STAT2) != 0xff)) {
-               set_current_state(TASK_INTERRUPTIBLE);
-               schedule_timeout(char_time);
+               msleep_interruptible(jiffies_to_msecs(char_time));
 
                if (signal_pending(current))
                        break;

diff --git a/drivers/char/ftape/lowlevel/ftape-io.c b/drivers/char/ftape/lowlevel/ftape-io.c
index bd3b2f117ce0c9d121a2865829ba552b922d89a4..b7910d429f34b52b445885f5bcc24b25395f92c1 100644 (file)
--- a/drivers/char/ftape/lowlevel/ftape-io.c
+++ b/drivers/char/ftape/lowlevel/ftape-io.c
@@ -32,6 +32,7 @@
 #include <asm/system.h>
 #include <linux/ioctl.h>
 #include <linux/mtio.h>
+#include <linux/delay.h>
 
 #include <linux/ftape.h>
 #include <linux/qic117.h>
@@ -96,19 +97,12 @@ void ftape_sleep(unsigned int time)
                timeout = ticks;
                save_flags(flags);
                sti();
-               set_current_state(TASK_INTERRUPTIBLE);
-               do {
-                       /*  Mmm. Isn't current->blocked == 0xffffffff ?
-                        */
-                       if (signal_pending(current)) {
-                               TRACE(ft_t_err,
-                                     "awoken by non-blocked signal :-(");
-                               break;  /* exit on signal */
-                       }
-                       while (current->state != TASK_RUNNING) {
-                               timeout = schedule_timeout(timeout);
-                       }
-               } while (timeout);
+               msleep_interruptible(jiffies_to_msecs(timeout));
+               /*  Mmm. Isn't current->blocked == 0xffffffff ?
+                */
+               if (signal_pending(current)) {
+                       TRACE(ft_t_err, "awoken by non-blocked signal :-(");
+               }
                restore_flags(flags);
        }
        TRACE_EXIT;

diff --git a/drivers/char/ftape/zftape/zftape-buffers.c b/drivers/char/ftape/zftape/zftape-buffers.c
index 3d64839834231509e0ba208c518c573f483c8ad6..ec4fdaabe39b18484cdeeb8ccf4c770ef844d110 100644 (file)
--- a/drivers/char/ftape/zftape/zftape-buffers.c
+++ b/drivers/char/ftape/zftape/zftape-buffers.c
@@ -27,6 +27,7 @@
 #include <linux/errno.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
+#include <linux/delay.h>
 
 #include <linux/zftape.h>
 
@@ -119,8 +120,7 @@ void *zft_kmalloc(size_t size)
        void *new;
 
        while ((new = kmalloc(size, GFP_KERNEL)) == NULL) {
-               current->state   = TASK_INTERRUPTIBLE;
-               schedule_timeout(HZ/10);
+               msleep_interruptible(100);
        }
        memset(new, 0, size);
        used_memory += size;

diff --git a/drivers/char/generic_serial.c b/drivers/char/generic_serial.c
index 45bc1be636691409a1e0979719bef44d989675c5..fd9ed4c3434a6991b6f2c188820f119c07fe6d11 100644 (file)
--- a/drivers/char/generic_serial.c
+++ b/drivers/char/generic_serial.c
@@ -26,6 +26,7 @@
 #include <linux/mm.h>
 #include <linux/generic_serial.h>
 #include <linux/interrupt.h>
+#include <linux/delay.h>
 #include <asm/semaphore.h>
 #include <asm/uaccess.h>
 
@@ -399,8 +400,7 @@ static int gs_wait_tx_flushed (void * ptr, int timeout)
                gs_dprintk (GS_DEBUG_FLUSH, "Expect to finish in %d jiffies "
                            "(%d chars).\n", jiffies_to_transmit, charsleft); 
 
-               set_current_state (TASK_INTERRUPTIBLE);
-               schedule_timeout(jiffies_to_transmit);
+               msleep_interruptible(jiffies_to_msecs(jiffies_to_transmit));
                if (signal_pending (current)) {
                        gs_dprintk (GS_DEBUG_FLUSH, "Signal pending. Bombing out: "); 
                        rv = -EINTR;
@@ -767,8 +767,7 @@ void gs_close(struct tty_struct * tty, struct file * filp)
 
        if (port->blocked_open) {
                if (port->close_delay) {
-                       set_current_state (TASK_INTERRUPTIBLE);
-                       schedule_timeout(port->close_delay);
+                       msleep_interruptible(jiffies_to_msecs(port->close_delay));
                }
                wake_up_interruptible(&port->open_wait);
        }

diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index 3c0af2cad6ee3c8851f0a5e0a96ebe75edd2c5d9..8d569ed74bc8002dfaf6e4f9a66fb8d4145049d4 100644 (file)
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -37,6 +37,7 @@
 #include <linux/tty_flip.h>
 #include <linux/sched.h>
 #include <linux/spinlock.h>
+#include <linux/delay.h>
 #include <asm/uaccess.h>
 #include <asm/hvconsole.h>
 #include <asm/vio.h>
@@ -44,7 +45,7 @@
 #define HVC_MAJOR      229
 #define HVC_MINOR      0
 
-#define TIMEOUT                ((HZ + 99) / 100)
+#define TIMEOUT                (10)
 
 /*
  * Wait this long per iteration while trying to push buffered data to the
@@ -607,7 +608,7 @@ int khvcd(void *unused)
                        if (poll_mask == 0)
                                schedule();
                        else
-                               schedule_timeout(TIMEOUT);
+                               msleep_interruptible(TIMEOUT);
                }
                __set_current_state(TASK_RUNNING);
        } while (!kthread_should_stop());

diff --git a/drivers/char/ip2main.c b/drivers/char/ip2main.c
index fa3ca6eb5d53772b0a0487e2dcf648368e781e74..e0cbd7552eb8fb8a53febdfd1db952ccc4b2a2d6 100644 (file)
--- a/drivers/char/ip2main.c
+++ b/drivers/char/ip2main.c
@@ -1632,8 +1632,7 @@ ip2_close( PTTY tty, struct file *pFile )
 
        if (pCh->wopen) {
                if (pCh->ClosingDelay) {
-                       current->state = TASK_INTERRUPTIBLE;
-                       schedule_timeout(pCh->ClosingDelay);
+                       msleep_interruptible(jiffies_to_msecs(pCh->ClosingDelay));
                }
                wake_up_interruptible(&pCh->open_wait);
        }

diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c
index b454bf2084bf8c450ba0b44ff5991eb0eb2ca3bd..eb8c18883a9d16ca2d0d3cc93dc79a1557b78b2b 100644 (file)
--- a/drivers/char/isicom.c
+++ b/drivers/char/isicom.c
@@ -1124,11 +1124,10 @@ static void isicom_close(struct tty_struct * tty, struct file * filp)
        port->tty = NULL;
        if (port->blocked_open) {
                if (port->close_delay) {
-                       set_current_state(TASK_INTERRUPTIBLE);
 #ifdef ISICOM_DEBUG                    
                        printk(KERN_DEBUG "ISICOM: scheduling until time out.\n");
 #endif                 
-                       schedule_timeout(port->close_delay);
+                       msleep_interruptible(jiffies_to_msecs(port->close_delay));
                }
                wake_up_interruptible(&port->open_wait);
        }       

diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index 9460f6d0bf97f3eceb67d1ec2743b754a3f5938d..832806725c1eeacafaa38f2085cc59e75f85b750 100644 (file)
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -691,7 +691,6 @@ static int  stli_rawopen(stlibrd_t *brdp, stliport_t *portp, unsigned long arg, i
 static int     stli_rawclose(stlibrd_t *brdp, stliport_t *portp, unsigned long arg, int wait);
 static int     stli_waitcarrier(stlibrd_t *brdp, stliport_t *portp, struct file *filp);
 static void    stli_dohangup(void *arg);
-static void    stli_delay(int len);
 static int     stli_setport(stliport_t *portp);
 static int     stli_cmdwait(stlibrd_t *brdp, stliport_t *portp, unsigned long cmd, void *arg, int size, int copyback);
 static void    stli_sendcmd(stlibrd_t *brdp, stliport_t *portp, unsigned long cmd, void *arg, int size, int copyback);
@@ -1180,7 +1179,7 @@ static void stli_close(struct tty_struct *tty, struct file *filp)
 
        if (portp->openwaitcnt) {
                if (portp->close_delay)
-                       stli_delay(portp->close_delay);
+                       msleep_interruptible(jiffies_to_msecs(portp->close_delay));
                wake_up_interruptible(&portp->open_wait);
        }
 
@@ -1477,25 +1476,6 @@ static int stli_setport(stliport_t *portp)
 
 /*****************************************************************************/
 
-/*
- *     Wait for a specified delay period, this is not a busy-loop. It will
- *     give up the processor while waiting. Unfortunately this has some
- *     rather intimate knowledge of the process management stuff.
- */
-
-static void stli_delay(int len)
-{
-#ifdef DEBUG
-       printk("stli_delay(len=%d)\n", len);
-#endif
-       if (len > 0) {
-               set_current_state(TASK_INTERRUPTIBLE);
-               schedule_timeout(len);
-       }
-}
-
-/*****************************************************************************/
-
 /*
  *     Possibly need to wait for carrier (DCD signal) to come high. Say
  *     maybe because if we are clocal then we don't need to wait...
@@ -2504,7 +2484,7 @@ static void stli_waituntilsent(struct tty_struct *tty, int timeout)
        while (test_bit(ST_TXBUSY, &portp->state)) {
                if (signal_pending(current))
                        break;
-               stli_delay(2);
+               msleep_interruptible(20);
                if (time_after_eq(jiffies, tend))
                        break;
        }

diff --git a/drivers/char/lcd.c b/drivers/char/lcd.c
index 64837783d180510512a27e36ad631a798850a593..717d812c2526d8f507b2cc6850a5198b856187e8 100644 (file)
--- a/drivers/char/lcd.c
+++ b/drivers/char/lcd.c
@@ -24,6 +24,7 @@
 #include <linux/mc146818rtc.h>
 #include <linux/netdevice.h>
 #include <linux/sched.h>
+#include <linux/delay.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -583,8 +584,7 @@ static long lcd_read(struct inode *inode, struct file *file, char *buf,
        lcd_waiters++;
        while (((buttons_now = (long) button_pressed()) == 0) &&
               !(signal_pending(current))) {
-               current->state = TASK_INTERRUPTIBLE;
-               schedule_timeout(2 * HZ);
+               msleep_interruptible(2000);
        }
        lcd_waiters--;
 

diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index d45d381d444f3e94961c5bad08c72ae50fbb52b1..11373907f29f7a4a4b9c360849acedd6a08dc195 100644 (file)
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -625,8 +625,7 @@ static void moxa_close(struct tty_struct *tty, struct file *filp)
        ch->tty = NULL;
        if (ch->blocked_open) {
                if (ch->close_delay) {
-                       set_current_state(TASK_INTERRUPTIBLE);
-                       schedule_timeout(ch->close_delay);
+                       msleep_interruptible(jiffies_to_msecs(ch->close_delay));
                }
                wake_up_interruptible(&ch->open_wait);
        }

diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index 147c1ba2efe8f6b432c1b8d2929e7b118c3492da..9ed493ed2220c88972a93529d845cec35a9bea63 100644 (file)
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -59,6 +59,7 @@
 #include <linux/smp_lock.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/delay.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
@@ -818,8 +819,7 @@ static void mxser_close(struct tty_struct *tty, struct file *filp)
        info->tty = NULL;
        if (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);
        }

diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 5d7f2154247d4b395129f8af4cfc6e2e107eefa4..f334dbfcf21f7c81582126f59b57ce07132ff36f 100644 (file)
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -2609,8 +2609,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
        
        if (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);
        }
@@ -2665,8 +2664,7 @@ static void mgslpc_wait_until_sent(struct tty_struct *tty, int timeout)
                
        if (info->params.mode == MGSL_MODE_HDLC) {
                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))
@@ -2675,8 +2673,7 @@ static void mgslpc_wait_until_sent(struct tty_struct *tty, int timeout)
        } else {
                while ((info->tx_count || info->tx_active) &&
                        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))
@@ -4129,8 +4126,7 @@ BOOLEAN irq_test(MGSLPC_INFO *info)
 
        end_time=100;
        while(end_time-- && !info->irq_occurred) {
-               set_current_state(TASK_INTERRUPTIBLE);
-               schedule_timeout(msecs_to_jiffies(10));
+               msleep_interruptible(10);
        }
        
        info->testing_irq = FALSE;

diff --git a/drivers/char/pcxx.c b/drivers/char/pcxx.c
index 061237bb0c33e0e0a5ee50770367437291ca3270..97fd9da9c5ef6cf56191712dbdd642907960f22e 100644 (file)
--- a/drivers/char/pcxx.c
+++ b/drivers/char/pcxx.c
@@ -538,8 +538,7 @@ static void pcxe_close(struct tty_struct * tty, struct file * filp)
                info->tty = NULL;
                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);
                }

diff --git a/drivers/char/riscom8.c b/drivers/char/riscom8.c
index a35ea03a3227777156776e98ea3138e7fec4d43a..616ecc65a06b93d90377c89e2024299281e92e5e 100644 (file)
--- a/drivers/char/riscom8.c
+++ b/drivers/char/riscom8.c
@@ -45,6 +45,7 @@
 #include <linux/fcntl.h>
 #include <linux/major.h>
 #include <linux/init.h>
+#include <linux/delay.h>
 
 #include <asm/uaccess.h>
 
@@ -1114,8 +1115,7 @@ static void rc_close(struct tty_struct * tty, struct file * filp)
                 */
                timeout = jiffies+HZ;
                while(port->IER & IER_TXEMPTY)  {
-                       current->state = TASK_INTERRUPTIBLE;
-                       schedule_timeout(port->timeout);
+                       msleep_interruptible(jiffies_to_msecs(port->timeout));
                        if (time_after(jiffies, timeout))
                                break;
                }
@@ -1130,8 +1130,7 @@ static void rc_close(struct tty_struct * tty, struct file * filp)
        port->tty = NULL;
        if (port->blocked_open) {
                if (port->close_delay) {
-                       current->state = TASK_INTERRUPTIBLE;
-                       schedule_timeout(port->close_delay);
+                       msleep_interruptible(jiffies_to_msecs(port->close_delay));
                }
                wake_up_interruptible(&port->open_wait);
        }

diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index 72af1bec91e56d599d94004af39e785361e05953..9f13fad3fc1128b1bca5eebc042e9171dfaab296 100644 (file)
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -1112,8 +1112,7 @@ static void rp_close(struct tty_struct *tty, struct file *filp)
 
        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);
        } else {
@@ -1538,8 +1537,7 @@ static void rp_wait_until_sent(struct tty_struct *tty, int timeout)
 #ifdef ROCKET_DEBUG_WAIT_UNTIL_SENT
                printk(KERN_INFO "txcnt = %d (jiff=%lu,check=%d)...", txcnt, jiffies, check_time);
 #endif
-               current->state = TASK_INTERRUPTIBLE;
-               schedule_timeout(check_time);
+               msleep_interruptible(jiffies_to_msecs(check_time));
                if (signal_pending(current))
                        break;
        }

diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c
index 885621edb4a65e985d7e297b8734b94b1fbae78c..b2538a6b85b096227ce9c394c621e738efd96daa 100644 (file)
--- a/drivers/char/serial167.c
+++ b/drivers/char/serial167.c
@@ -1840,8 +1840,7 @@ cy_close(struct tty_struct * tty, struct file * filp)
     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);
     }

diff --git a/drivers/char/specialix.c b/drivers/char/specialix.c
index bf82f06d401135552c334743a44c513436437529..568edc38313c4cf06fd8bc003696ed3a26f407a9 100644 (file)
--- a/drivers/char/specialix.c
+++ b/drivers/char/specialix.c
@@ -1452,8 +1452,7 @@ static void sx_close(struct tty_struct * tty, struct file * filp)
                 */
                timeout = jiffies+HZ;
                while(port->IER & IER_TXEMPTY) {
-                       current->state = TASK_INTERRUPTIBLE;
-                       schedule_timeout(port->timeout);
+                       msleep_interruptible(jiffies_to_msecs(port->timeout));
                        if (time_after(jiffies, timeout)) {
                                printk (KERN_INFO "Timeout waiting for close\n");
                                break;
@@ -1470,8 +1469,7 @@ static void sx_close(struct tty_struct * tty, struct file * filp)
        port->tty = NULL;
        if (port->blocked_open) {
                if (port->close_delay) {
-                       current->state = TASK_INTERRUPTIBLE;
-                       schedule_timeout(port->close_delay);
+                       msleep_interruptible(jiffies_to_msecs(port->close_delay));
                }
                wake_up_interruptible(&port->open_wait);
        }

diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index 90018ce17c57fd3bffea7a94786bc3465188cc6d..38a7e846b813d23975c50e9a00e9484723265c30 100644 (file)
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -42,6 +42,7 @@
 #include <linux/smp_lock.h>
 #include <linux/devfs_fs_kernel.h>
 #include <linux/device.h>
+#include <linux/delay.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -512,7 +513,6 @@ static int  stl_clrportstats(stlport_t *portp, comstats_t __user *cp);
 static int     stl_getportstruct(stlport_t __user *arg);
 static int     stl_getbrdstruct(stlbrd_t __user *arg);
 static int     stl_waitcarrier(stlport_t *portp, struct file *filp);
-static void    stl_delay(int len);
 static void    stl_eiointr(stlbrd_t *brdp);
 static void    stl_echatintr(stlbrd_t *brdp);
 static void    stl_echmcaintr(stlbrd_t *brdp);
@@ -1204,7 +1204,7 @@ static void stl_close(struct tty_struct *tty, struct file *filp)
 
        if (portp->openwaitcnt) {
                if (portp->close_delay)
-                       stl_delay(portp->close_delay);
+                       msleep_interruptible(jiffies_to_msecs(portp->close_delay));
                wake_up_interruptible(&portp->open_wait);
        }
 
@@ -1215,25 +1215,6 @@ static void stl_close(struct tty_struct *tty, struct file *filp)
 
 /*****************************************************************************/
 
-/*
- *     Wait for a specified delay period, this is not a busy-loop. It will
- *     give up the processor while waiting. Unfortunately this has some
- *     rather intimate knowledge of the process management stuff.
- */
-
-static void stl_delay(int len)
-{
-#ifdef DEBUG
-       printk("stl_delay(len=%d)\n", len);
-#endif
-       if (len > 0) {
-               current->state = TASK_INTERRUPTIBLE;
-               schedule_timeout(len);
-       }
-}
-
-/*****************************************************************************/
-
 /*
  *     Write routine. Take data and stuff it in to the TX ring queue.
  *     If transmit interrupts are not running then start them.
@@ -1854,7 +1835,7 @@ static void stl_waituntilsent(struct tty_struct *tty, int timeout)
        while (stl_datastate(portp)) {
                if (signal_pending(current))
                        break;
-               stl_delay(2);
+               msleep_interruptible(20);
                if (time_after_eq(jiffies, tend))
                        break;
        }

diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index 0a1cc1d3630f392a40c9a4a1435a924190baf32e..edf89fffe4e1a93452477e357f9295eb39b34bf7 100644 (file)
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -82,6 +82,7 @@
 #include <linux/ioport.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
+#include <linux/delay.h>
 
 #include <linux/netdevice.h>
 
@@ -3259,8 +3260,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
        
        if (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);
        }
@@ -3326,8 +3326,7 @@ static void mgsl_wait_until_sent(struct tty_struct *tty, int timeout)
        if ( 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))
@@ -3336,8 +3335,7 @@ static void mgsl_wait_until_sent(struct tty_struct *tty, int timeout)
        } 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))
@@ -7200,8 +7198,7 @@ BOOLEAN mgsl_irq_test( struct mgsl_struct *info )
 
        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);

diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c
index 5648ed35562f0f6323a6e7655a162ef99dae669e..9ccce79fdf4e6f39c15cb845ada922b006215bba 100644 (file)
--- a/drivers/char/synclinkmp.c
+++ b/drivers/char/synclinkmp.c
@@ -878,8 +878,7 @@ static void close(struct tty_struct *tty, struct file *filp)
 
        if (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);
        }
@@ -1164,8 +1163,7 @@ static void wait_until_sent(struct tty_struct *tty, int timeout)
 
        if ( info->params.mode == MGSL_MODE_HDLC ) {
                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))
@@ -1175,8 +1173,7 @@ static void wait_until_sent(struct tty_struct *tty, int timeout)
                //TODO: determine if there is something similar to USC16C32
                //      TXSTATUS_ALL_SENT status
                while ( info->tx_active && 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))
@@ -5209,8 +5206,7 @@ int irq_test(SLMP_INFO *info)
 
        timeout=100;
        while( timeout-- && !info->irq_occurred ) {
-               set_current_state(TASK_INTERRUPTIBLE);
-               schedule_timeout(msecs_to_jiffies(10));
+               msleep_interruptible(10);
        }
 
        spin_lock_irqsave(&info->lock,flags);
@@ -5360,8 +5356,7 @@ int loopback_test(SLMP_INFO *info)
        /* wait for receive complete */
        /* Set a timeout for waiting for interrupt. */
        for ( timeout = 100; timeout; --timeout ) {
-               set_current_state(TASK_INTERRUPTIBLE);
-               schedule_timeout(msecs_to_jiffies(10));
+               msleep_interruptible(10);
 
                if (rx_get_frame(info)) {
                        rc = TRUE;

diff --git a/drivers/char/tpqic02.c b/drivers/char/tpqic02.c
index 66881e953399e1b00927f8885d8eb75cf9f1d3b9..d812253b447323277c434084ab3df790205d2472 100644 (file)
--- a/drivers/char/tpqic02.c
+++ b/drivers/char/tpqic02.c
@@ -554,10 +554,9 @@ static int wait_for_ready(time_t timeout)
            /* not ready and no exception && timeout not expired yet */
        while (((stat = inb_p(QIC02_STAT_PORT) & QIC02_STAT_MASK) == QIC02_STAT_MASK) && time_before(jiffies, spin_t)) {
                /* be `nice` to other processes on long operations... */
-               current->state = TASK_INTERRUPTIBLE;
                /* nap 0.30 sec between checks, */
                /* but could be woken up earlier by signals... */
-               schedule_timeout(3 * HZ / 10);
+               msleep_interruptible(300);
        }
 
        /* don't use jiffies for this test because it may have changed by now */