24 files changed, 1 insertions, 34 deletions

diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c
index 7572665a8855..9fd0de4b7afd 100644
--- a/drivers/serial/21285.c
+++ b/drivers/serial/21285.c
@@ -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,
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index bbf78aaf9e01..f361b356bd1d 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -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,
diff --git a/drivers/serial/at91_serial.c b/drivers/serial/at91_serial.c
index db5b25fafed4..df9500bdaded 100644
--- a/drivers/serial/at91_serial.c
+++ b/drivers/serial/at91_serial.c
@@ -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,
diff --git a/drivers/serial/dz.c b/drivers/serial/dz.c
index bf71bad5c34f..466d06cc7d37 100644
--- a/drivers/serial/dz.c
+++ b/drivers/serial/dz.c
@@ -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,
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index d202eb4f3848..da85bafa0942 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -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),
diff --git a/drivers/serial/ip22zilog.c b/drivers/serial/ip22zilog.c
index 651772474ac1..56b093ecd779 100644
--- a/drivers/serial/ip22zilog.c
+++ b/drivers/serial/ip22zilog.c
@@ -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,
diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c
index 321a40f33b50..6a2a25d9b596 100644
--- a/drivers/serial/m32r_sio.c
+++ b/drivers/serial/m32r_sio.c
@@ -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,
diff --git a/drivers/serial/mcfserial.c b/drivers/serial/mcfserial.c
index 8ad242934368..29c0630e3e64 100644
--- a/drivers/serial/mcfserial.c
+++ b/drivers/serial/mcfserial.c
@@ -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;
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 6459edc7f5c5..1aa34844218c 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -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,
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c
index 94681922ea0a..1cd102f84bfa 100644
--- a/drivers/serial/mpsc.c
+++ b/drivers/serial/mpsc.c
@@ -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,
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index 513ff8597707..e3ba7e17a240 100644
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/serial/pmac_zilog.c
@@ -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,
 };
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c
index ae3649568541..0fa0ccc9ed27 100644
--- a/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
@@ -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,
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
index 837b6da520b3..4c62ab949ecc 100644
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -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,
 };
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c
index c2d9068b491d..8bbd8567669c 100644
--- a/drivers/serial/sa1100.c
+++ b/drivers/serial/sa1100.c
@@ -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,
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 17839e753e4c..84d70d855598 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -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);
 
diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c
index 3bdee64d1a99..a901a7e446f3 100644
--- a/drivers/serial/serial_txx9.c
+++ b/drivers/serial/serial_txx9.c
@@ -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,
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 44f6bf79bbe1..d97f3ca6cc29 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -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,
diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c
index ba22e256c6f7..d36bc4003399 100644
--- a/drivers/serial/sunhv.c
+++ b/drivers/serial/sunhv.c
@@ -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,
 };
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index e4c0fd2d6a9d..7da02d11c364 100644
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
@@ -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,
 };
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 0268b307c01e..6e28c25138cf 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -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,
 };
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 76c9bac9271f..9f42677287ad 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -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,
 };
diff --git a/drivers/serial/v850e_uart.c b/drivers/serial/v850e_uart.c
index df705fda4243..a0da2aaf71c4 100644
--- a/drivers/serial/v850e_uart.c
+++ b/drivers/serial/v850e_uart.c
@@ -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,
diff --git a/drivers/serial/vr41xx_siu.c b/drivers/serial/vr41xx_siu.c
index df5e8713fa31..017571ffa19c 100644
--- a/drivers/serial/vr41xx_siu.c
+++ b/drivers/serial/vr41xx_siu.c
@@ -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,
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 951c4e858274..fc1104a2cfa9 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -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;