serial: diminish usage of struct serial_uart_config

This structure might have made sense many years ago, but at this
point it is only used in one specific driver, and referenced in
stale comments elsewhere.  Rather than change the sunsu.c driver,
simply move the struct to be within the exclusive domain of that
driver, so it won't get inadvertently picked up and used by other
serial drivers going forward.  The comments referencing the now
driver specific struct are updated accordingly.

Note that 8250.c has a struct that is similar in usage, with the
name serial8250_config; but is 100% independent and untouched here.

Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/speakup/serialio.h b/drivers/staging/speakup/serialio.h
index 614271f9b99f8a86d3b927445ed6eb9b79919904..55d68b5ad1650d18fa3cf2fb2a5fe60f2f3536e4 100644 (file)
--- a/drivers/staging/speakup/serialio.h
+++ b/drivers/staging/speakup/serialio.h
@@ -1,8 +1,7 @@
 #ifndef _SPEAKUP_SERIAL_H
 #define _SPEAKUP_SERIAL_H
 
-#include <linux/serial.h>      /* for rs_table, serial constants &
-                                  serial_uart_config */
+#include <linux/serial.h>      /* for rs_table, serial constants */
 #include <linux/serial_reg.h>  /* for more serial constants */
 #ifndef __sparc__
 #include <asm/serial.h>

diff --git a/drivers/tty/serial/8250/8250.h b/drivers/tty/serial/8250/8250.h
index 972b5212b58cbc3f28fef7a112fbbda17301606c..0c5e908df0b55cbc8fa535b5efc77bf496b12ad7 100644 (file)
--- a/drivers/tty/serial/8250/8250.h
+++ b/drivers/tty/serial/8250/8250.h
@@ -26,9 +26,6 @@ struct old_serial_port {
        unsigned long irqflags;
 };
 
-/*
- * This replaces serial_uart_config in include/linux/serial.h
- */
 struct serial8250_config {
        const char      *name;
        unsigned short  fifo_size;

diff --git a/drivers/tty/serial/sunsu.c b/drivers/tty/serial/sunsu.c
index d9190957a5f496a03853664c6e8602407ff730b2..b97913dcdbffbc701ae8c2f7acae84b8a3dbc6b8 100644 (file)
--- a/drivers/tty/serial/sunsu.c
+++ b/drivers/tty/serial/sunsu.c
@@ -58,6 +58,12 @@
 enum su_type { SU_PORT_NONE, SU_PORT_MS, SU_PORT_KBD, SU_PORT_PORT };
 static char *su_typev[] = { "su(???)", "su(mouse)", "su(kbd)", "su(serial)" };
 
+struct serial_uart_config {
+       char    *name;
+       int     dfl_xmit_fifo_size;
+       int     flags;
+};
+
 /*
  * Here we define the default xmit fifo size used for each type of UART.
  */

diff --git a/include/linux/serial.h b/include/linux/serial.h
index 3504f428ce66a70a864e38509318c1e6610a7750..861e51de476bf8e55399f5796cfa68e89ba3718f 100644 (file)
--- a/include/linux/serial.h
+++ b/include/linux/serial.h
@@ -86,12 +86,6 @@ struct serial_struct {
 #define SERIAL_IO_HUB6 1
 #define SERIAL_IO_MEM  2
 
-struct serial_uart_config {
-       char    *name;
-       int     dfl_xmit_fifo_size;
-       int     flags;
-};
-
 #define UART_CLEAR_FIFO                0x01
 #define UART_USE_FIFO          0x02
 #define UART_STARTECH          0x04