aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorAlan Cox <alan@redhat.com>2008-07-16 21:57:02 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-20 17:12:38 -0700
commit77451e53e0a509a98eda272567869cfe96431ba9 (patch)
tree93b79e0aeebd4533f95235101e44112559cdc8dd /include/linux
parentae67751785dae388beb31fc24d14870d0d4669d9 (diff)
cyclades: use tty_port
Switch cyclades to use the new tty_port structure Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/cyclades.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h
index 504cb2c3fa9..a982b74a6ee 100644
--- a/include/linux/cyclades.h
+++ b/include/linux/cyclades.h
@@ -550,11 +550,11 @@ struct cyclades_icount {
struct cyclades_port {
int magic;
+ struct tty_port port;
struct cyclades_card *card;
int line;
int flags; /* defined in tty.h */
int type; /* UART type */
- struct tty_struct *tty;
int read_status_mask;
int ignore_status_mask;
int timeout;
@@ -569,11 +569,8 @@ struct cyclades_port {
u8 x_char; /* to be pushed out ASAP */
int close_delay;
unsigned short closing_wait;
- int count; /* # of fd on device */
int breakon;
int breakoff;
- int blocked_open; /* # of blocked opens */
- unsigned char *xmit_buf;
int xmit_head;
int xmit_tail;
int xmit_cnt;
@@ -583,8 +580,6 @@ struct cyclades_port {
struct cyclades_monitor mon;
struct cyclades_idle_stats idle_stats;
struct cyclades_icount icount;
- wait_queue_head_t open_wait;
- wait_queue_head_t close_wait;
struct completion shutdown_wait;
wait_queue_head_t delta_msr_wait;
int throttle;