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>
This commit is contained in:
parent
e2c654254e
commit
4b71598b6a
|
@ -1,8 +1,7 @@
|
||||||
#ifndef _SPEAKUP_SERIAL_H
|
#ifndef _SPEAKUP_SERIAL_H
|
||||||
#define _SPEAKUP_SERIAL_H
|
#define _SPEAKUP_SERIAL_H
|
||||||
|
|
||||||
#include <linux/serial.h> /* for rs_table, serial constants &
|
#include <linux/serial.h> /* for rs_table, serial constants */
|
||||||
serial_uart_config */
|
|
||||||
#include <linux/serial_reg.h> /* for more serial constants */
|
#include <linux/serial_reg.h> /* for more serial constants */
|
||||||
#ifndef __sparc__
|
#ifndef __sparc__
|
||||||
#include <asm/serial.h>
|
#include <asm/serial.h>
|
||||||
|
|
|
@ -26,9 +26,6 @@ struct old_serial_port {
|
||||||
unsigned long irqflags;
|
unsigned long irqflags;
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
|
||||||
* This replaces serial_uart_config in include/linux/serial.h
|
|
||||||
*/
|
|
||||||
struct serial8250_config {
|
struct serial8250_config {
|
||||||
const char *name;
|
const char *name;
|
||||||
unsigned short fifo_size;
|
unsigned short fifo_size;
|
||||||
|
|
|
@ -58,6 +58,12 @@
|
||||||
enum su_type { SU_PORT_NONE, SU_PORT_MS, SU_PORT_KBD, SU_PORT_PORT };
|
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)" };
|
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.
|
* Here we define the default xmit fifo size used for each type of UART.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -86,12 +86,6 @@ struct serial_struct {
|
||||||
#define SERIAL_IO_HUB6 1
|
#define SERIAL_IO_HUB6 1
|
||||||
#define SERIAL_IO_MEM 2
|
#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_CLEAR_FIFO 0x01
|
||||||
#define UART_USE_FIFO 0x02
|
#define UART_USE_FIFO 0x02
|
||||||
#define UART_STARTECH 0x04
|
#define UART_STARTECH 0x04
|
||||||
|
|
Loading…
Reference in New Issue