Commit 77451e53 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

cyclades: use tty_port

Switch cyclades to use the new tty_port structure
Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ae677517
This diff is collapsed.
...@@ -550,11 +550,11 @@ struct cyclades_icount { ...@@ -550,11 +550,11 @@ struct cyclades_icount {
struct cyclades_port { struct cyclades_port {
int magic; int magic;
struct tty_port port;
struct cyclades_card *card; struct cyclades_card *card;
int line; int line;
int flags; /* defined in tty.h */ int flags; /* defined in tty.h */
int type; /* UART type */ int type; /* UART type */
struct tty_struct *tty;
int read_status_mask; int read_status_mask;
int ignore_status_mask; int ignore_status_mask;
int timeout; int timeout;
...@@ -569,11 +569,8 @@ struct cyclades_port { ...@@ -569,11 +569,8 @@ struct cyclades_port {
u8 x_char; /* to be pushed out ASAP */ u8 x_char; /* to be pushed out ASAP */
int close_delay; int close_delay;
unsigned short closing_wait; unsigned short closing_wait;
int count; /* # of fd on device */
int breakon; int breakon;
int breakoff; int breakoff;
int blocked_open; /* # of blocked opens */
unsigned char *xmit_buf;
int xmit_head; int xmit_head;
int xmit_tail; int xmit_tail;
int xmit_cnt; int xmit_cnt;
...@@ -583,8 +580,6 @@ struct cyclades_port { ...@@ -583,8 +580,6 @@ struct cyclades_port {
struct cyclades_monitor mon; struct cyclades_monitor mon;
struct cyclades_idle_stats idle_stats; struct cyclades_idle_stats idle_stats;
struct cyclades_icount icount; struct cyclades_icount icount;
wait_queue_head_t open_wait;
wait_queue_head_t close_wait;
struct completion shutdown_wait; struct completion shutdown_wait;
wait_queue_head_t delta_msr_wait; wait_queue_head_t delta_msr_wait;
int throttle; int throttle;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment