[PATCH] devfs: Remove devfs support from the serial subsystem
Also fixes all serial drivers. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
bdaf852938
commit
aa4148cfc7
|
@ -479,7 +479,6 @@ static struct uart_driver serial21285_reg = {
|
|||
.owner = THIS_MODULE,
|
||||
.driver_name = "ttyFB",
|
||||
.dev_name = "ttyFB",
|
||||
.devfs_name = "ttyFB",
|
||||
.major = SERIAL_21285_MAJOR,
|
||||
.minor = SERIAL_21285_MINOR,
|
||||
.nr = 1,
|
||||
|
|
|
@ -2354,7 +2354,6 @@ int __init serial8250_start_console(struct uart_port *port, char *options)
|
|||
static struct uart_driver serial8250_reg = {
|
||||
.owner = THIS_MODULE,
|
||||
.driver_name = "serial",
|
||||
.devfs_name = "tts/",
|
||||
.dev_name = "ttyS",
|
||||
.major = TTY_MAJOR,
|
||||
.minor = 64,
|
||||
|
|
|
@ -863,7 +863,6 @@ static struct uart_driver at91_uart = {
|
|||
.owner = THIS_MODULE,
|
||||
.driver_name = "at91_serial",
|
||||
.dev_name = AT91_DEVICENAME,
|
||||
.devfs_name = AT91_DEVICENAME,
|
||||
.major = SERIAL_AT91_MAJOR,
|
||||
.minor = MINOR_START,
|
||||
.nr = AT91_NR_UART,
|
||||
|
|
|
@ -768,11 +768,7 @@ void __init dz_serial_console_init(void)
|
|||
static struct uart_driver dz_reg = {
|
||||
.owner = THIS_MODULE,
|
||||
.driver_name = "serial",
|
||||
#ifdef CONFIG_DEVFS
|
||||
.dev_name = "tts/%d",
|
||||
#else
|
||||
.dev_name = "ttyS%d",
|
||||
#endif
|
||||
.major = TTY_MAJOR,
|
||||
.minor = 64,
|
||||
.nr = DZ_NB_PORT,
|
||||
|
|
|
@ -888,7 +888,6 @@ static struct uart_driver imx_reg = {
|
|||
.owner = THIS_MODULE,
|
||||
.driver_name = DRIVER_NAME,
|
||||
.dev_name = "ttySMX",
|
||||
.devfs_name = "ttsmx/",
|
||||
.major = SERIAL_IMX_MAJOR,
|
||||
.minor = MINOR_START,
|
||||
.nr = ARRAY_SIZE(imx_ports),
|
||||
|
|
|
@ -1085,7 +1085,6 @@ static struct console ip22zilog_console = {
|
|||
static struct uart_driver ip22zilog_reg = {
|
||||
.owner = THIS_MODULE,
|
||||
.driver_name = "serial",
|
||||
.devfs_name = "tts/",
|
||||
.dev_name = "ttyS",
|
||||
.major = TTY_MAJOR,
|
||||
.minor = 64,
|
||||
|
|
|
@ -1131,7 +1131,6 @@ console_initcall(m32r_sio_console_init);
|
|||
static struct uart_driver m32r_sio_reg = {
|
||||
.owner = THIS_MODULE,
|
||||
.driver_name = "sio",
|
||||
.devfs_name = "tts/",
|
||||
.dev_name = "ttyS",
|
||||
.major = TTY_MAJOR,
|
||||
.minor = 64,
|
||||
|
|
|
@ -1713,7 +1713,6 @@ mcfrs_init(void)
|
|||
/* Initialize the tty_driver structure */
|
||||
mcfrs_serial_driver->owner = THIS_MODULE;
|
||||
mcfrs_serial_driver->name = "ttyS";
|
||||
mcfrs_serial_driver->devfs_name = "ttys/";
|
||||
mcfrs_serial_driver->driver_name = "serial";
|
||||
mcfrs_serial_driver->major = TTY_MAJOR;
|
||||
mcfrs_serial_driver->minor_start = 64;
|
||||
|
|
|
@ -693,7 +693,6 @@ static struct uart_driver mpc52xx_uart_driver = {
|
|||
.owner = THIS_MODULE,
|
||||
.driver_name = "mpc52xx_psc_uart",
|
||||
.dev_name = "ttyPSC",
|
||||
.devfs_name = "ttyPSC",
|
||||
.major = SERIAL_PSC_MAJOR,
|
||||
.minor = SERIAL_PSC_MINOR,
|
||||
.nr = MPC52xx_PSC_MAXNUM,
|
||||
|
|
|
@ -315,7 +315,6 @@ struct mpsc_port_info *mpsc_device_remove(int index);
|
|||
#define MPSC_MAJOR 204
|
||||
#define MPSC_MINOR_START 44
|
||||
#define MPSC_DRIVER_NAME "MPSC"
|
||||
#define MPSC_DEVFS_NAME "ttymm/"
|
||||
#define MPSC_DEV_NAME "ttyMM"
|
||||
#define MPSC_VERSION "1.00"
|
||||
|
||||
|
@ -1863,7 +1862,6 @@ static struct platform_driver mpsc_shared_driver = {
|
|||
static struct uart_driver mpsc_reg = {
|
||||
.owner = THIS_MODULE,
|
||||
.driver_name = MPSC_DRIVER_NAME,
|
||||
.devfs_name = MPSC_DEVFS_NAME,
|
||||
.dev_name = MPSC_DEV_NAME,
|
||||
.major = MPSC_MAJOR,
|
||||
.minor = MPSC_MINOR_START,
|
||||
|
|
|
@ -101,7 +101,6 @@ static DEFINE_MUTEX(pmz_irq_mutex);
|
|||
static struct uart_driver pmz_uart_reg = {
|
||||
.owner = THIS_MODULE,
|
||||
.driver_name = "ttyS",
|
||||
.devfs_name = "tts/",
|
||||
.dev_name = "ttyS",
|
||||
.major = TTY_MAJOR,
|
||||
};
|
||||
|
|
|
@ -780,7 +780,6 @@ static struct uart_pxa_port serial_pxa_ports[] = {
|
|||
static struct uart_driver serial_pxa_reg = {
|
||||
.owner = THIS_MODULE,
|
||||
.driver_name = "PXA serial",
|
||||
.devfs_name = "tts/",
|
||||
.dev_name = "ttyS",
|
||||
.major = TTY_MAJOR,
|
||||
.minor = 64,
|
||||
|
|
|
@ -149,7 +149,6 @@ s3c24xx_serial_dbg(const char *fmt, ...)
|
|||
/* UART name and device definitions */
|
||||
|
||||
#define S3C24XX_SERIAL_NAME "ttySAC"
|
||||
#define S3C24XX_SERIAL_DEVFS "tts/"
|
||||
#define S3C24XX_SERIAL_MAJOR 204
|
||||
#define S3C24XX_SERIAL_MINOR 64
|
||||
|
||||
|
@ -952,7 +951,6 @@ static struct uart_driver s3c24xx_uart_drv = {
|
|||
.nr = 3,
|
||||
.cons = S3C24XX_SERIAL_CONSOLE,
|
||||
.driver_name = S3C24XX_SERIAL_NAME,
|
||||
.devfs_name = S3C24XX_SERIAL_DEVFS,
|
||||
.major = S3C24XX_SERIAL_MAJOR,
|
||||
.minor = S3C24XX_SERIAL_MINOR,
|
||||
};
|
||||
|
|
|
@ -816,7 +816,6 @@ static struct uart_driver sa1100_reg = {
|
|||
.owner = THIS_MODULE,
|
||||
.driver_name = "ttySA",
|
||||
.dev_name = "ttySA",
|
||||
.devfs_name = "ttySA",
|
||||
.major = SERIAL_SA1100_MAJOR,
|
||||
.minor = MINOR_START,
|
||||
.nr = NR_PORTS,
|
||||
|
|
|
@ -2153,7 +2153,6 @@ int uart_register_driver(struct uart_driver *drv)
|
|||
|
||||
normal->owner = drv->owner;
|
||||
normal->driver_name = drv->driver_name;
|
||||
normal->devfs_name = drv->devfs_name;
|
||||
normal->name = drv->dev_name;
|
||||
normal->major = drv->major;
|
||||
normal->minor_start = drv->minor;
|
||||
|
@ -2312,7 +2311,7 @@ int uart_remove_one_port(struct uart_driver *drv, struct uart_port *port)
|
|||
mutex_unlock(&state->mutex);
|
||||
|
||||
/*
|
||||
* Remove the devices from devfs
|
||||
* Remove the devices from the tty layer
|
||||
*/
|
||||
tty_unregister_device(drv->tty_driver, port->line);
|
||||
|
||||
|
|
|
@ -69,12 +69,10 @@ static char *serial_name = "TX39/49 Serial driver";
|
|||
#if !defined(CONFIG_SERIAL_TXX9_STDSERIAL)
|
||||
/* "ttyS" is used for standard serial driver */
|
||||
#define TXX9_TTY_NAME "ttyTX"
|
||||
#define TXX9_TTY_DEVFS_NAME "tttx/"
|
||||
#define TXX9_TTY_MINOR_START (64 + 64) /* ttyTX0(128), ttyTX1(129) */
|
||||
#else
|
||||
/* acts like standard serial driver */
|
||||
#define TXX9_TTY_NAME "ttyS"
|
||||
#define TXX9_TTY_DEVFS_NAME "tts/"
|
||||
#define TXX9_TTY_MINOR_START 64
|
||||
#endif
|
||||
#define TXX9_TTY_MAJOR TTY_MAJOR
|
||||
|
@ -971,7 +969,6 @@ console_initcall(serial_txx9_console_init);
|
|||
static struct uart_driver serial_txx9_reg = {
|
||||
.owner = THIS_MODULE,
|
||||
.driver_name = "serial_txx9",
|
||||
.devfs_name = TXX9_TTY_DEVFS_NAME,
|
||||
.dev_name = TXX9_TTY_NAME,
|
||||
.major = TXX9_TTY_MAJOR,
|
||||
.minor = TXX9_TTY_MINOR_START,
|
||||
|
|
|
@ -1699,9 +1699,6 @@ static char banner[] __initdata =
|
|||
static struct uart_driver sci_uart_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.driver_name = "sci",
|
||||
#ifdef CONFIG_DEVFS_FS
|
||||
.devfs_name = "ttsc/",
|
||||
#endif
|
||||
.dev_name = "ttySC",
|
||||
.major = SCI_MAJOR,
|
||||
.minor = SCI_MINOR_START,
|
||||
|
|
|
@ -353,7 +353,6 @@ static struct uart_ops sunhv_pops = {
|
|||
static struct uart_driver sunhv_reg = {
|
||||
.owner = THIS_MODULE,
|
||||
.driver_name = "serial",
|
||||
.devfs_name = "tts/",
|
||||
.dev_name = "ttyS",
|
||||
.major = TTY_MAJOR,
|
||||
};
|
||||
|
|
|
@ -851,7 +851,6 @@ static struct uart_ops sunsab_pops = {
|
|||
static struct uart_driver sunsab_reg = {
|
||||
.owner = THIS_MODULE,
|
||||
.driver_name = "serial",
|
||||
.devfs_name = "tts/",
|
||||
.dev_name = "ttyS",
|
||||
.major = TTY_MAJOR,
|
||||
};
|
||||
|
|
|
@ -1265,7 +1265,6 @@ out:
|
|||
static struct uart_driver sunsu_reg = {
|
||||
.owner = THIS_MODULE,
|
||||
.driver_name = "serial",
|
||||
.devfs_name = "tts/",
|
||||
.dev_name = "ttyS",
|
||||
.major = TTY_MAJOR,
|
||||
};
|
||||
|
|
|
@ -1017,7 +1017,6 @@ static int zilog_irq = -1;
|
|||
static struct uart_driver sunzilog_reg = {
|
||||
.owner = THIS_MODULE,
|
||||
.driver_name = "ttyS",
|
||||
.devfs_name = "tts/",
|
||||
.dev_name = "ttyS",
|
||||
.major = TTY_MAJOR,
|
||||
};
|
||||
|
|
|
@ -468,7 +468,6 @@ static struct uart_ops v850e_uart_ops = {
|
|||
static struct uart_driver v850e_uart_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.driver_name = "v850e_uart",
|
||||
.devfs_name = "tts/",
|
||||
.dev_name = "ttyS",
|
||||
.major = TTY_MAJOR,
|
||||
.minor = V850E_UART_MINOR_BASE,
|
||||
|
|
|
@ -911,7 +911,6 @@ static struct uart_driver siu_uart_driver = {
|
|||
.owner = THIS_MODULE,
|
||||
.driver_name = "SIU",
|
||||
.dev_name = "ttyVR",
|
||||
.devfs_name = "ttvr/",
|
||||
.major = SIU_MAJOR,
|
||||
.minor = SIU_MINOR_BASE,
|
||||
.cons = SERIAL_VR41XX_CONSOLE,
|
||||
|
|
|
@ -336,7 +336,6 @@ struct uart_driver {
|
|||
struct module *owner;
|
||||
const char *driver_name;
|
||||
const char *dev_name;
|
||||
const char *devfs_name;
|
||||
int major;
|
||||
int minor;
|
||||
int nr;
|
||||
|
|
Loading…
Reference in New Issue