TTY: amiserial no longer needs serialP

amiserial is the last user of serialP.h. Let's move struct
serial_state directly to amiserial and remove serialP crap from
includes. Finally, remove the header from the tree completely.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c
index b182bccf3eab681b1f0f26e65ef02be62eab3fd4..613d6a3908d38bac2df4d52b00368ad63c3c1f1c 100644 (file)
--- a/drivers/tty/amiserial.c
+++ b/drivers/tty/amiserial.c
@@ -58,7 +58,6 @@
 
 #include <linux/types.h>
 #include <linux/serial.h>
-#include <linux/serialP.h>
 #include <linux/serial_reg.h>
 static char *serial_version = "4.30";
 
@@ -70,6 +69,7 @@ static char *serial_version = "4.30";
 #include <linux/interrupt.h>
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
+#include <linux/circ_buf.h>
 #include <linux/console.h>
 #include <linux/major.h>
 #include <linux/string.h>
@@ -92,6 +92,24 @@ static char *serial_version = "4.30";
 #include <asm/amigahw.h>
 #include <asm/amigaints.h>
 
+struct serial_state {
+       struct tty_port         tport;
+       struct circ_buf         xmit;
+       struct async_icount     icount;
+
+       unsigned long           port;
+       int                     baud_base;
+       int                     xmit_fifo_size;
+       int                     custom_divisor;
+       int                     read_status_mask;
+       int                     ignore_status_mask;
+       int                     timeout;
+       int                     quot;
+       int                     IER;    /* Interrupt Enable Register */
+       int                     MCR;    /* Modem control register */
+       int                     x_char; /* xon/xoff character */
+};
+
 #define custom amiga_custom
 static char *serial_name = "Amiga-builtin serial driver";
 

diff --git a/include/linux/serialP.h b/include/linux/serialP.h
deleted file mode 100644 (file)
index 77afbdb..0000000
--- a/include/linux/serialP.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Private header file for the (dumb) serial driver
- *
- * Copyright (C) 1997 by Theodore Ts'o.
- * 
- * Redistribution of this file is permitted under the terms of the GNU 
- * Public License (GPL)
- */
-
-#ifndef _LINUX_SERIALP_H
-#define _LINUX_SERIALP_H
-
-/*
- * This is our internal structure for each serial port's state.
- * 
- * Many fields are paralleled by the structure used by the serial_struct
- * structure.
- *
- * For definitions of the flags field, see tty.h
- */
-
-#include <linux/termios.h>
-#include <linux/workqueue.h>
-#include <linux/interrupt.h>
-#include <linux/circ_buf.h>
-#include <linux/tty.h>
-#include <linux/wait.h>
-
-struct serial_state {
-       int     baud_base;
-       unsigned long   port;
-       int     xmit_fifo_size;
-       int     custom_divisor;
-       struct async_icount     icount; 
-       struct tty_port tport;
-
-       /* amiserial */
-       int                     read_status_mask;
-       int                     ignore_status_mask;
-       int                     timeout;
-       int                     quot;
-       int                     IER;    /* Interrupt Enable Register */
-       int                     MCR;    /* Modem control register */
-       int                     x_char; /* xon/xoff character */
-       struct circ_buf         xmit;
-       /* /amiserial */
-};
-
-#endif /* _LINUX_SERIAL_H */