TTY: simserial/amiserial, use one instance of other members

This means:
* close_delay
* closing_wait
* line
* port
* xmit_fifo_size

This actually fixes a bug in amiserial. It initializes one and uses
the other of the close delays. Yes, duplicating structure members is
evil.

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>

1 files changed, 0 insertions, 5 deletions

diff --git a/include/linux/serialP.h b/include/linux/serialP.h
index 6741f57cc2ae..6ce488c46589 100644
--- a/include/linux/serialP.h
+++ b/include/linux/serialP.h
@@ -42,8 +42,6 @@ struct serial_state {
 };
 
 struct async_struct {
-        unsigned long           port;
-        int                     xmit_fifo_size;
         struct serial_state     *state;
         struct tty_struct       *tty;
         int                     read_status_mask;
@@ -51,11 +49,8 @@ struct async_struct {
         int                     timeout;
         int                     quot;
         int                     x_char; /* xon/xoff character */
-        int                     close_delay;
-        unsigned short          closing_wait;
         int                     IER;    /* Interrupt Enable Register */
         int                     MCR;    /* Modem control register */
-        int                     line;
         int                     blocked_open; /* # of blocked opens */
         struct circ_buf         xmit;
         wait_queue_head_t       open_wait;