TTY: serial/m32r_sio, disband m32r_sio.h

The only needed information from the header is struct old_serial_port.
Move it to m32r_sio.c, make it const and anonymous. And kill the rest
from the header as it is dead stuff.

Given m32r_sio_suspend_port and m32r_sio_resume_port are local to
m32r_sio.c and unused, kill them from .c too.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 10 insertions, 27 deletions

diff --git a/drivers/tty/serial/m32r_sio.c b/drivers/tty/serial/m32r_sio.c
index 0eeb64f2499c..3c76ffc2d10a 100644
--- a/drivers/tty/serial/m32r_sio.c
+++ b/drivers/tty/serial/m32r_sio.c
@@ -47,7 +47,6 @@
 #define BAUD_RATE       115200
 
 #include <linux/serial_core.h>
-#include "m32r_sio.h"
 #include "m32r_sio_reg.h"
 
 /*
@@ -98,7 +97,16 @@
 
 #endif /* !CONFIG_PLAT_USRV */
 
-static struct old_serial_port old_serial_port[] = {
+static const struct {
+        unsigned int uart;
+        unsigned int baud_base;
+        unsigned int port;
+        unsigned int irq;
+        unsigned int flags;
+        unsigned char io_type;
+        unsigned char __iomem *iomem_base;
+        unsigned short iomem_reg_shift;
+} old_serial_port[] = {
         SERIAL_PORT_DFNS
 };
 
@@ -1112,28 +1120,6 @@ static struct uart_driver m32r_sio_reg = {
         .cons                   = M32R_SIO_CONSOLE,
 };
 
-/**
- *      m32r_sio_suspend_port - suspend one serial port
- *      @line: serial line number
- *
- *      Suspend one serial port.
- */
-void m32r_sio_suspend_port(int line)
-{
-        uart_suspend_port(&m32r_sio_reg, &m32r_sio_ports[line].port);
-}
-
-/**
- *      m32r_sio_resume_port - resume one serial port
- *      @line: serial line number
- *
- *      Resume one serial port.
- */
-void m32r_sio_resume_port(int line)
-{
-        uart_resume_port(&m32r_sio_reg, &m32r_sio_ports[line].port);
-}
-
 static int __init m32r_sio_init(void)
 {
         int ret, i;
@@ -1163,8 +1149,5 @@ static void __exit m32r_sio_exit(void)
 module_init(m32r_sio_init);
 module_exit(m32r_sio_exit);
 
-EXPORT_SYMBOL(m32r_sio_suspend_port);
-EXPORT_SYMBOL(m32r_sio_resume_port);
-
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Generic M32R SIO serial driver");