diff options
| -rw-r--r-- | drivers/tc/zs.c | 8 | ||||
| -rw-r--r-- | drivers/tc/zs.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/tc/zs.c b/drivers/tc/zs.c index 887fea87f..84111ee1a 100644 --- a/drivers/tc/zs.c +++ b/drivers/tc/zs.c @@ -155,7 +155,7 @@ static struct termios *serial_termios_locked[NUM_CHANNELS]; * memory if large numbers of serial ports are open. */ static unsigned char tmp_buf[4096]; /* This is cheating */ -static struct semaphore tmp_buf_sem = MUTEX; +static DECLARE_MUTEX(tmp_buf_sem); static inline int serial_paranoia_check(struct dec_serial *info, dev_t device, const char *routine) @@ -1352,7 +1352,7 @@ void rs_hangup(struct tty_struct *tty) static int block_til_ready(struct tty_struct *tty, struct file * filp, struct dec_serial *info) { - struct wait_queue wait = { current, NULL }; + DECLARE_WAITQUEUE(wait, current); int retval; int do_clocal = 0; @@ -1774,8 +1774,8 @@ __initfunc(int zs_init(void)) info->tqueue.data = info; info->callout_termios =callout_driver.init_termios; info->normal_termios = serial_driver.init_termios; - info->open_wait = 0; - info->close_wait = 0; + init_waitqueue_head(&info->open_wait); + init_waitqueue_head(&info->close_wait); printk("tty%02d at 0x%08x (irq = %d)", info->line, info->port, info->irq); printk(" is a Z85C30 SCC\n"); diff --git a/drivers/tc/zs.h b/drivers/tc/zs.h index d45ce05ed..e10e1c3d2 100644 --- a/drivers/tc/zs.h +++ b/drivers/tc/zs.h @@ -142,8 +142,8 @@ struct dec_serial { struct tq_struct tqueue_hangup; struct termios normal_termios; struct termios callout_termios; - struct wait_queue *open_wait; - struct wait_queue *close_wait; + wait_queue_head_t open_wait; + wait_queue_head_t close_wait; }; |