patch-2.3.16 linux/drivers/tc/zs.c

• Lines: 71
• Date: Tue Aug 31 11:30:48 1999
• Orig file: v2.3.15/linux/drivers/tc/zs.c
• Orig date: Fri Jun 25 17:38:40 1999

diff -u --recursive --new-file v2.3.15/linux/drivers/tc/zs.c linux/drivers/tc/zs.c
@@ -1315,7 +1315,6 @@
 		char_time = MIN(char_time, timeout);
 	while ((read_zsreg(info->zs_channel, 1) & ALL_SNT) == 0) {
 		current->state = TASK_INTERRUPTIBLE;
-		current->counter = 0;	/* make us low-priority */
 		schedule_timeout(char_time);
 		if (signal_pending(current))
 			break;
@@ -1433,7 +1432,7 @@
 		    (tty->termios->c_cflag & CBAUD))
 			zs_rtsdtr(info, 1);
 		sti();
-		current->state = TASK_INTERRUPTIBLE;
+		set_current_state(TASK_INTERRUPTIBLE);
 		if (tty_hung_up_p(filp) ||
 		    !(info->flags & ZILOG_INITIALIZED)) {
 #ifdef SERIAL_DO_RESTART
@@ -1564,7 +1563,7 @@
 
 /* Finally, routines used to initialize the serial driver. */
 
-__initfunc(static void show_serial_version(void))
+static void __init show_serial_version(void)
 {
 	printk("DECstation Z8530 serial driver version 0.03\n");
 }
@@ -1572,7 +1571,7 @@
 /*  Initialize Z8530s zs_channels
  */
 
-__initfunc(static void probe_sccs(void))
+static void __init probe_sccs(void)
 {
 	struct dec_serial **pp;
 	int i, n, n_chips = 0, n_channels, chip, channel;
@@ -1654,7 +1653,7 @@
 }
 
 /* zs_init inits the driver */
-__initfunc(int zs_init(void))
+int __init zs_init(void)
 {
 	int channel, i;
 	unsigned long flags;
@@ -1886,7 +1885,7 @@
  *	- initialize the serial port
  *	Return non-zero if we didn't find a serial port.
  */
-__initfunc(static int serial_console_setup(struct console *co, char *options))
+static int __init serial_console_setup(struct console *co, char *options)
 {
 	struct dec_serial *info;
 	int	baud = 9600;
@@ -2022,7 +2021,7 @@
 /*
  *	Register console.
  */
-__initfunc (long zs_serial_console_init(long kmem_start, long kmem_end))
+long __init zs_serial_console_init(long kmem_start, long kmem_end)
 {
 	register_console(&sercons);
 	return kmem_start;
@@ -2087,7 +2086,7 @@
  * for /dev/ttyb which is determined in setup_arch() from the
  * boot command line flags.
  */
-__initfunc(void zs_kgdb_hook(int tty_num))
+void __init zs_kgdb_hook(int tty_num)
 {
 	/* Find out how many Z8530 SCCs we have */
 	if (zs_chain == 0)