diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2012-03-05 14:52:20 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-08 12:28:48 -0800 |
| commit | 916b765675b7044bd5895b7430a2aa2c63ea4545 (patch) | |
| tree | 55a876c662dc2efa4990984de7f3286cc3371b63 /include/linux/serialP.h | |
| parent | 13c9062122a8d05e0881ca8bd9037d2e57e56860 (diff) | |
| download | linux-916b765675b7044bd5895b7430a2aa2c63ea4545.tar.gz linux-916b765675b7044bd5895b7430a2aa2c63ea4545.tar.bz2 linux-916b765675b7044bd5895b7430a2aa2c63ea4545.zip | |
TTY: serialP, merge serial_state and async_struct
This is the final step to get rid of the one of the structures. A
further cleanup will follow. And I struct serial_state deserves cease
to exist after a switch to tty_port too.
While changing the lines, it removes also pointless tty->driver_data
casts.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/serialP.h')
| -rw-r--r-- | include/linux/serialP.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/serialP.h b/include/linux/serialP.h index b8543f902453..984f5ba8da4e 100644 --- a/include/linux/serialP.h +++ b/include/linux/serialP.h @@ -38,24 +38,24 @@ struct serial_state { unsigned short close_delay; unsigned short closing_wait; /* time to wait before closing */ struct async_icount icount; - struct async_struct *info; -}; -struct async_struct { - struct serial_state *state; - struct tty_struct *tty; + /* amiserial */ int read_status_mask; int ignore_status_mask; int timeout; int quot; - int x_char; /* xon/xoff character */ int IER; /* Interrupt Enable Register */ int MCR; /* Modem control register */ + wait_queue_head_t delta_msr_wait; + /* simserial */ + int x_char; /* xon/xoff character */ int blocked_open; /* # of blocked opens */ struct circ_buf xmit; wait_queue_head_t open_wait; wait_queue_head_t close_wait; - wait_queue_head_t delta_msr_wait; + struct tty_struct *tty; + /* /simserial */ + /* /amiserial */ }; #endif /* _LINUX_SERIAL_H */ |