patch-2.3.16 linux/drivers/char/dz.c

• Lines: 54
• Date: Tue Aug 31 11:30:48 1999
• Orig file: v2.3.15/linux/drivers/char/dz.c
• Orig date: Mon Jul 5 20:35:18 1999

diff -u --recursive --new-file v2.3.15/linux/drivers/char/dz.c linux/drivers/char/dz.c
@@ -902,7 +902,7 @@
   
   dz_out (info, DZ_TCR, tmp);
   
-  schedule_timeout(jiffies + duration);
+  schedule_timeout(duration);
   
   tmp &= ~mask;
   dz_out (info, DZ_TCR, tmp);
@@ -1093,7 +1093,7 @@
   if (info->blocked_open) {
     if (info->close_delay) {
       current->state = TASK_INTERRUPTIBLE;
-      schedule_timeout(jiffies + info->close_delay);
+      schedule_timeout(info->close_delay);
     }
     wake_up_interruptible (&info->open_wait);
   }
@@ -1194,7 +1194,7 @@
   info->count--;
   info->blocked_open++;
   while (1) {
-    current->state = TASK_INTERRUPTIBLE;
+    set_current_state(TASK_INTERRUPTIBLE);
     if (tty_hung_up_p (filp) || !(info->is_initialized)) {
       retval = -EAGAIN;
       break;
@@ -1281,7 +1281,7 @@
 }
 
 
-__initfunc(int dz_init(void))
+int __init dz_init(void)
 {
   int i, flags;
   struct dz_serial *info;
@@ -1454,7 +1454,7 @@
 	return MKDEV(TTY_MAJOR, 64 + c->index);
 }
 
-__initfunc(static int dz_console_setup(struct console *co, char *options))
+static int __init dz_console_setup(struct console *co, char *options)
 {
   	int	baud = 9600;
 	int	bits = 8;
@@ -1590,7 +1590,7 @@
 	NULL
 };
 
-__initfunc (long dz_serial_console_init(long kmem_start, long kmem_end))
+long __init dz_serial_console_init(long kmem_start, long kmem_end)
 {
 	register_console(&dz_sercons);