tty: Split tty_port into its own file

Not much in it yet but this will grow a lot

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

3 files changed, 56 insertions, 37 deletions

diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 77ea41b88ea8..1a4247dccac4 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -7,7 +7,7 @@
 #
 FONTMAPFILE = cp437.uni
 
-obj-y    += mem.o random.o tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o tty_buffer.o
+obj-y    += mem.o random.o tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o tty_buffer.o tty_port.o
 
 obj-$(CONFIG_LEGACY_PTYS)       += pty.o
 obj-$(CONFIG_UNIX98_PTYS)       += pty.o
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 3a726936aa5b..732316899ca4 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -1139,42 +1139,6 @@ ssize_t redirected_tty_write(struct file *file, const char __user *buf,
         return tty_write(file, buf, count, ppos);
 }
 
-void tty_port_init(struct tty_port *port)
-{
-        memset(port, 0, sizeof(*port));
-        init_waitqueue_head(&port->open_wait);
-        init_waitqueue_head(&port->close_wait);
-        mutex_init(&port->mutex);
-        port->close_delay = (50 * HZ) / 100;
-        port->closing_wait = (3000 * HZ) / 100;
-}
-EXPORT_SYMBOL(tty_port_init);
-
-int tty_port_alloc_xmit_buf(struct tty_port *port)
-{
-        /* We may sleep in get_zeroed_page() */
-        mutex_lock(&port->mutex);
-        if (port->xmit_buf == NULL)
-                port->xmit_buf = (unsigned char *)get_zeroed_page(GFP_KERNEL);
-        mutex_unlock(&port->mutex);
-        if (port->xmit_buf == NULL)
-                return -ENOMEM;
-        return 0;
-}
-EXPORT_SYMBOL(tty_port_alloc_xmit_buf);
-
-void tty_port_free_xmit_buf(struct tty_port *port)
-{
-        mutex_lock(&port->mutex);
-        if (port->xmit_buf != NULL) {
-                free_page((unsigned long)port->xmit_buf);
-                port->xmit_buf = NULL;
-        }
-        mutex_unlock(&port->mutex);
-}
-EXPORT_SYMBOL(tty_port_free_xmit_buf);
-
-
 static char ptychar[] = "pqrstuvwxyzabcde";
 
 /**
diff --git a/drivers/char/tty_port.c b/drivers/char/tty_port.c
new file mode 100644
index 000000000000..6fadb19d630b
--- /dev/null
+++ b/drivers/char/tty_port.c
@@ -0,0 +1,55 @@
+/*
+ * Tty port functions
+ */
+
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/tty.h>
+#include <linux/tty_driver.h>
+#include <linux/tty_flip.h>
+#include <linux/timer.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/sched.h>
+#include <linux/init.h>
+#include <linux/wait.h>
+#include <linux/bitops.h>
+#include <linux/delay.h>
+#include <linux/module.h>
+
+void tty_port_init(struct tty_port *port)
+{
+        memset(port, 0, sizeof(*port));
+        init_waitqueue_head(&port->open_wait);
+        init_waitqueue_head(&port->close_wait);
+        mutex_init(&port->mutex);
+        port->close_delay = (50 * HZ) / 100;
+        port->closing_wait = (3000 * HZ) / 100;
+}
+EXPORT_SYMBOL(tty_port_init);
+
+int tty_port_alloc_xmit_buf(struct tty_port *port)
+{
+        /* We may sleep in get_zeroed_page() */
+        mutex_lock(&port->mutex);
+        if (port->xmit_buf == NULL)
+                port->xmit_buf = (unsigned char *)get_zeroed_page(GFP_KERNEL);
+        mutex_unlock(&port->mutex);
+        if (port->xmit_buf == NULL)
+                return -ENOMEM;
+        return 0;
+}
+EXPORT_SYMBOL(tty_port_alloc_xmit_buf);
+
+void tty_port_free_xmit_buf(struct tty_port *port)
+{
+        mutex_lock(&port->mutex);
+        if (port->xmit_buf != NULL) {
+                free_page((unsigned long)port->xmit_buf);
+                port->xmit_buf = NULL;
+        }
+        mutex_unlock(&port->mutex);
+}
+EXPORT_SYMBOL(tty_port_free_xmit_buf);
+
+