CVS Update@linux-mips.org: linux

[ralf@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ralf@ftp.linux-mips.org 05/01/27 00:33:39

Modified files:
        arch/mips/au1000/db1x00: mirage_ts.c 

Log message:
        Use wait_event_timeout() instead of the deprecated
        interruptible_sleep_on_timeout(). The current code does not seem to
        care about signals, so interruptible seems unnecessary.

diff -urN linux/arch/mips/au1000/db1x00/mirage_ts.c 
linux/arch/mips/au1000/db1x00/mirage_ts.c
--- linux/arch/mips/au1000/db1x00/mirage_ts.c   2004/10/25 20:44:16     1.3
+++ linux/arch/mips/au1000/db1x00/mirage_ts.c   2005/01/27 00:33:38     1.4
@@ -42,6 +42,7 @@
 #include <linux/proc_fs.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
+#include <linux/wait.h>
 
 #include <asm/segment.h>
 #include <asm/irq.h>
@@ -147,10 +148,7 @@
        ts = wm97xx_ts_get_handle(0);
 
        /* proceed only after everybody is ready */
-       while ( ! wm97xx_ts_ready(ts) ) {
-               /* give a little time for initializations to complete */
-               interruptible_sleep_on_timeout(&pendown_wait, HZ / 4);
-       }
+       wait_event_timeout(pendown_wait, wm97xx_ts_ready(ts), HZ/4);
 
        /* board-specific calibration */
        wm97xx_ts_set_cal(ts,