diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /drivers/tc/zs.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'drivers/tc/zs.c')
| -rw-r--r-- | drivers/tc/zs.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/tc/zs.c b/drivers/tc/zs.c index f22b17ac5..c31334f4a 100644 --- a/drivers/tc/zs.c +++ b/drivers/tc/zs.c @@ -1316,7 +1316,6 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout) char_time = MIN(char_time, timeout); while ((read_zsreg(info->zs_channel, 1) & Tx_BUF_EMP) == 0) { current->state = TASK_INTERRUPTIBLE; - current->counter = 0; /* make us low-priority */ schedule_timeout(char_time); if (signal_pending(current)) break; @@ -1434,7 +1433,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp, (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 @@ -1565,7 +1564,7 @@ int rs_open(struct tty_struct *tty, struct file * filp) /* 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"); } @@ -1573,7 +1572,7 @@ __initfunc(static void show_serial_version(void)) /* 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; @@ -1655,7 +1654,7 @@ __initfunc(static void probe_sccs(void)) } /* zs_init inits the driver */ -__initfunc(int zs_init(void)) +int __init zs_init(void) { int channel, i; unsigned long flags; @@ -1887,7 +1886,7 @@ static kdev_t serial_console_device(struct console *c) * - 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; @@ -2023,7 +2022,7 @@ static struct console sercons = { /* * 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; @@ -2088,7 +2087,7 @@ static inline void kgdb_chaninit(struct dec_zschannel *ms, int intson, int bps) * 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) |