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>

1 files changed, 7 insertions, 7 deletions

diff --git a/include/linux/serialP.h b/include/linux/serialP.h
index b8543f90245..984f5ba8da4 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 */