From e60a10844879794c7b592acf123cbf9ea0e2c0e7 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Wed, 16 Jul 2008 21:56:18 +0100 Subject: rocket: use tty_port Switch the rocketport to use the new tty_port structure Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds --- drivers/char/rocket_int.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'drivers/char/rocket_int.h') diff --git a/drivers/char/rocket_int.h b/drivers/char/rocket_int.h index 143cc432fdb..3affc48f6a5 100644 --- a/drivers/char/rocket_int.h +++ b/drivers/char/rocket_int.h @@ -1125,11 +1125,9 @@ Warnings: This function writes the data byte without checking to see if struct r_port { int magic; + struct tty_port port; int line; - int flags; - int count; - int blocked_open; - struct tty_struct *tty; + int flags; /* Don't yet match the ASY_ flags!! */ unsigned int board:3; unsigned int aiop:2; unsigned int chan:3; @@ -1148,8 +1146,7 @@ struct r_port { int read_status_mask; int cps; - wait_queue_head_t open_wait; - struct completion close_wait; + struct completion close_wait; /* Not yet matching the core */ spinlock_t slock; struct mutex write_mtx; }; -- cgit v1.2.3