patch-2.3.16 linux/drivers/sbus/char/zs.c

• Lines: 92
• Date: Tue Aug 31 11:30:48 1999
• Orig file: v2.3.15/linux/drivers/sbus/char/zs.c
• Orig date: Mon Aug 2 22:07:16 1999

diff -u --recursive --new-file v2.3.15/linux/drivers/sbus/char/zs.c linux/drivers/sbus/char/zs.c
@@ -1,4 +1,4 @@
-/* $Id: zs.c,v 1.43 1999/07/17 06:03:58 zaitcev Exp $
+/* $Id: zs.c,v 1.44 1999/08/31 06:58:32 davem Exp $
  * zs.c: Zilog serial port driver for the Sparc.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -1711,7 +1711,7 @@
 		if (!(info->flags & ZILOG_CALLOUT_ACTIVE))
 			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_DEBUG_OPEN
@@ -1844,7 +1844,7 @@
 
 static void show_serial_version(void)
 {
-	char *revision = "$Revision: 1.43 $";
+	char *revision = "$Revision: 1.44 $";
 	char *version, *p;
 
 	version = strchr(revision, ' ');
@@ -1862,8 +1862,7 @@
  *       we have a special version for sun4u.
  */
 #ifdef __sparc_v9__
-__initfunc(static struct sun_zslayout *
-get_zs(int chip))
+static struct sun_zslayout * __init get_zs(int chip)
 {
 	unsigned int vaddr[2] = { 0, 0 };
 	unsigned long mapped_addr = 0;
@@ -1971,8 +1970,7 @@
 		return (struct sun_zslayout *) (unsigned long) vaddr[0];
 }
 #else /* !(__sparc_v9__) */
-__initfunc(static struct sun_zslayout *
-get_zs(int chip))
+static struct sun_zslayout * __init get_zs(int chip)
 {
 	struct linux_prom_irqs tmp_irq[2];
 	unsigned int paddr = 0;
@@ -2112,7 +2110,7 @@
 	write_zsreg(zs_soft[channel].zs_channel, R13, ((brg >> 8) & 0xff));
 }
 
-__initfunc(int zs_probe (unsigned long *memory_start))
+int __init zs_probe (unsigned long *memory_start)
 {
 	char *p;
 	int node;
@@ -2265,7 +2263,7 @@
 	restore_flags(flags);
 }
 
-__initfunc(int zs_init(void))
+int __init zs_init(void)
 {
 	int channel, brg, i;
 	unsigned long flags;
@@ -2534,8 +2532,7 @@
  * for /dev/ttyb which is determined in setup_arch() from the
  * boot command line flags.
  */
-__initfunc(static void
-zs_kgdb_hook(int tty_num))
+static void __init zs_kgdb_hook(int tty_num)
 {
 	int chip = 0;
 
@@ -2647,8 +2644,7 @@
 	return MKDEV(TTY_MAJOR, 64 + con->index);
 }
 
-__initfunc(static int
-zs_console_setup(struct console *con, char *options))
+static int __init zs_console_setup(struct console *con, char *options)
 {
 	struct sun_serial *info;
 	int i, brg, baud;
@@ -2729,8 +2725,7 @@
 	NULL
 };
 
-__initfunc(static int
-zs_console_init(void))
+static int __init zs_console_init(void)
 {
 	extern int con_is_present(void);