diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-21 00:15:16 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-26 15:25:05 -0400 |
commit | aa4148cfc7b3b93eeaf755a7d14f10afaffe9a96 (patch) | |
tree | 7f1c84f3cf7c0c79ccdb94a62a3543ee19e5edc2 | |
parent | bdaf8529385d5126ef791e8f1914afff8cd59bcf (diff) |
[PATCH] devfs: Remove devfs support from the serial subsystem
Also fixes all serial drivers.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/serial/21285.c | 1 | ||||
-rw-r--r-- | drivers/serial/8250.c | 1 | ||||
-rw-r--r-- | drivers/serial/at91_serial.c | 1 | ||||
-rw-r--r-- | drivers/serial/dz.c | 4 | ||||
-rw-r--r-- | drivers/serial/imx.c | 1 | ||||
-rw-r--r-- | drivers/serial/ip22zilog.c | 1 | ||||
-rw-r--r-- | drivers/serial/m32r_sio.c | 1 | ||||
-rw-r--r-- | drivers/serial/mcfserial.c | 1 | ||||
-rw-r--r-- | drivers/serial/mpc52xx_uart.c | 1 | ||||
-rw-r--r-- | drivers/serial/mpsc.c | 2 | ||||
-rw-r--r-- | drivers/serial/pmac_zilog.c | 1 | ||||
-rw-r--r-- | drivers/serial/pxa.c | 1 | ||||
-rw-r--r-- | drivers/serial/s3c2410.c | 2 | ||||
-rw-r--r-- | drivers/serial/sa1100.c | 1 | ||||
-rw-r--r-- | drivers/serial/serial_core.c | 3 | ||||
-rw-r--r-- | drivers/serial/serial_txx9.c | 3 | ||||
-rw-r--r-- | drivers/serial/sh-sci.c | 3 | ||||
-rw-r--r-- | drivers/serial/sunhv.c | 1 | ||||
-rw-r--r-- | drivers/serial/sunsab.c | 1 | ||||
-rw-r--r-- | drivers/serial/sunsu.c | 1 | ||||
-rw-r--r-- | drivers/serial/sunzilog.c | 1 | ||||
-rw-r--r-- | drivers/serial/v850e_uart.c | 1 | ||||
-rw-r--r-- | drivers/serial/vr41xx_siu.c | 1 | ||||
-rw-r--r-- | include/linux/serial_core.h | 1 |
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 = { | |||
479 | .owner = THIS_MODULE, | 479 | .owner = THIS_MODULE, |
480 | .driver_name = "ttyFB", | 480 | .driver_name = "ttyFB", |
481 | .dev_name = "ttyFB", | 481 | .dev_name = "ttyFB", |
482 | .devfs_name = "ttyFB", | ||
483 | .major = SERIAL_21285_MAJOR, | 482 | .major = SERIAL_21285_MAJOR, |
484 | .minor = SERIAL_21285_MINOR, | 483 | .minor = SERIAL_21285_MINOR, |
485 | .nr = 1, | 484 | .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) | |||
2354 | static struct uart_driver serial8250_reg = { | 2354 | static struct uart_driver serial8250_reg = { |
2355 | .owner = THIS_MODULE, | 2355 | .owner = THIS_MODULE, |
2356 | .driver_name = "serial", | 2356 | .driver_name = "serial", |
2357 | .devfs_name = "tts/", | ||
2358 | .dev_name = "ttyS", | 2357 | .dev_name = "ttyS", |
2359 | .major = TTY_MAJOR, | 2358 | .major = TTY_MAJOR, |
2360 | .minor = 64, | 2359 | .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 = { | |||
863 | .owner = THIS_MODULE, | 863 | .owner = THIS_MODULE, |
864 | .driver_name = "at91_serial", | 864 | .driver_name = "at91_serial", |
865 | .dev_name = AT91_DEVICENAME, | 865 | .dev_name = AT91_DEVICENAME, |
866 | .devfs_name = AT91_DEVICENAME, | ||
867 | .major = SERIAL_AT91_MAJOR, | 866 | .major = SERIAL_AT91_MAJOR, |
868 | .minor = MINOR_START, | 867 | .minor = MINOR_START, |
869 | .nr = AT91_NR_UART, | 868 | .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) | |||
768 | static struct uart_driver dz_reg = { | 768 | static struct uart_driver dz_reg = { |
769 | .owner = THIS_MODULE, | 769 | .owner = THIS_MODULE, |
770 | .driver_name = "serial", | 770 | .driver_name = "serial", |
771 | #ifdef CONFIG_DEVFS | ||
772 | .dev_name = "tts/%d", | ||
773 | #else | ||
774 | .dev_name = "ttyS%d", | 771 | .dev_name = "ttyS%d", |
775 | #endif | ||
776 | .major = TTY_MAJOR, | 772 | .major = TTY_MAJOR, |
777 | .minor = 64, | 773 | .minor = 64, |
778 | .nr = DZ_NB_PORT, | 774 | .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 = { | |||
888 | .owner = THIS_MODULE, | 888 | .owner = THIS_MODULE, |
889 | .driver_name = DRIVER_NAME, | 889 | .driver_name = DRIVER_NAME, |
890 | .dev_name = "ttySMX", | 890 | .dev_name = "ttySMX", |
891 | .devfs_name = "ttsmx/", | ||
892 | .major = SERIAL_IMX_MAJOR, | 891 | .major = SERIAL_IMX_MAJOR, |
893 | .minor = MINOR_START, | 892 | .minor = MINOR_START, |
894 | .nr = ARRAY_SIZE(imx_ports), | 893 | .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 = { | |||
1085 | static struct uart_driver ip22zilog_reg = { | 1085 | static struct uart_driver ip22zilog_reg = { |
1086 | .owner = THIS_MODULE, | 1086 | .owner = THIS_MODULE, |
1087 | .driver_name = "serial", | 1087 | .driver_name = "serial", |
1088 | .devfs_name = "tts/", | ||
1089 | .dev_name = "ttyS", | 1088 | .dev_name = "ttyS", |
1090 | .major = TTY_MAJOR, | 1089 | .major = TTY_MAJOR, |
1091 | .minor = 64, | 1090 | .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); | |||
1131 | static struct uart_driver m32r_sio_reg = { | 1131 | static struct uart_driver m32r_sio_reg = { |
1132 | .owner = THIS_MODULE, | 1132 | .owner = THIS_MODULE, |
1133 | .driver_name = "sio", | 1133 | .driver_name = "sio", |
1134 | .devfs_name = "tts/", | ||
1135 | .dev_name = "ttyS", | 1134 | .dev_name = "ttyS", |
1136 | .major = TTY_MAJOR, | 1135 | .major = TTY_MAJOR, |
1137 | .minor = 64, | 1136 | .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) | |||
1713 | /* Initialize the tty_driver structure */ | 1713 | /* Initialize the tty_driver structure */ |
1714 | mcfrs_serial_driver->owner = THIS_MODULE; | 1714 | mcfrs_serial_driver->owner = THIS_MODULE; |
1715 | mcfrs_serial_driver->name = "ttyS"; | 1715 | mcfrs_serial_driver->name = "ttyS"; |
1716 | mcfrs_serial_driver->devfs_name = "ttys/"; | ||
1717 | mcfrs_serial_driver->driver_name = "serial"; | 1716 | mcfrs_serial_driver->driver_name = "serial"; |
1718 | mcfrs_serial_driver->major = TTY_MAJOR; | 1717 | mcfrs_serial_driver->major = TTY_MAJOR; |
1719 | mcfrs_serial_driver->minor_start = 64; | 1718 | 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 = { | |||
693 | .owner = THIS_MODULE, | 693 | .owner = THIS_MODULE, |
694 | .driver_name = "mpc52xx_psc_uart", | 694 | .driver_name = "mpc52xx_psc_uart", |
695 | .dev_name = "ttyPSC", | 695 | .dev_name = "ttyPSC", |
696 | .devfs_name = "ttyPSC", | ||
697 | .major = SERIAL_PSC_MAJOR, | 696 | .major = SERIAL_PSC_MAJOR, |
698 | .minor = SERIAL_PSC_MINOR, | 697 | .minor = SERIAL_PSC_MINOR, |
699 | .nr = MPC52xx_PSC_MAXNUM, | 698 | .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); | |||
315 | #define MPSC_MAJOR 204 | 315 | #define MPSC_MAJOR 204 |
316 | #define MPSC_MINOR_START 44 | 316 | #define MPSC_MINOR_START 44 |
317 | #define MPSC_DRIVER_NAME "MPSC" | 317 | #define MPSC_DRIVER_NAME "MPSC" |
318 | #define MPSC_DEVFS_NAME "ttymm/" | ||
319 | #define MPSC_DEV_NAME "ttyMM" | 318 | #define MPSC_DEV_NAME "ttyMM" |
320 | #define MPSC_VERSION "1.00" | 319 | #define MPSC_VERSION "1.00" |
321 | 320 | ||
@@ -1863,7 +1862,6 @@ static struct platform_driver mpsc_shared_driver = { | |||
1863 | static struct uart_driver mpsc_reg = { | 1862 | static struct uart_driver mpsc_reg = { |
1864 | .owner = THIS_MODULE, | 1863 | .owner = THIS_MODULE, |
1865 | .driver_name = MPSC_DRIVER_NAME, | 1864 | .driver_name = MPSC_DRIVER_NAME, |
1866 | .devfs_name = MPSC_DEVFS_NAME, | ||
1867 | .dev_name = MPSC_DEV_NAME, | 1865 | .dev_name = MPSC_DEV_NAME, |
1868 | .major = MPSC_MAJOR, | 1866 | .major = MPSC_MAJOR, |
1869 | .minor = MPSC_MINOR_START, | 1867 | .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); | |||
101 | static struct uart_driver pmz_uart_reg = { | 101 | static struct uart_driver pmz_uart_reg = { |
102 | .owner = THIS_MODULE, | 102 | .owner = THIS_MODULE, |
103 | .driver_name = "ttyS", | 103 | .driver_name = "ttyS", |
104 | .devfs_name = "tts/", | ||
105 | .dev_name = "ttyS", | 104 | .dev_name = "ttyS", |
106 | .major = TTY_MAJOR, | 105 | .major = TTY_MAJOR, |
107 | }; | 106 | }; |
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[] = { | |||
780 | static struct uart_driver serial_pxa_reg = { | 780 | static struct uart_driver serial_pxa_reg = { |
781 | .owner = THIS_MODULE, | 781 | .owner = THIS_MODULE, |
782 | .driver_name = "PXA serial", | 782 | .driver_name = "PXA serial", |
783 | .devfs_name = "tts/", | ||
784 | .dev_name = "ttyS", | 783 | .dev_name = "ttyS", |
785 | .major = TTY_MAJOR, | 784 | .major = TTY_MAJOR, |
786 | .minor = 64, | 785 | .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, ...) | |||
149 | /* UART name and device definitions */ | 149 | /* UART name and device definitions */ |
150 | 150 | ||
151 | #define S3C24XX_SERIAL_NAME "ttySAC" | 151 | #define S3C24XX_SERIAL_NAME "ttySAC" |
152 | #define S3C24XX_SERIAL_DEVFS "tts/" | ||
153 | #define S3C24XX_SERIAL_MAJOR 204 | 152 | #define S3C24XX_SERIAL_MAJOR 204 |
154 | #define S3C24XX_SERIAL_MINOR 64 | 153 | #define S3C24XX_SERIAL_MINOR 64 |
155 | 154 | ||
@@ -952,7 +951,6 @@ static struct uart_driver s3c24xx_uart_drv = { | |||
952 | .nr = 3, | 951 | .nr = 3, |
953 | .cons = S3C24XX_SERIAL_CONSOLE, | 952 | .cons = S3C24XX_SERIAL_CONSOLE, |
954 | .driver_name = S3C24XX_SERIAL_NAME, | 953 | .driver_name = S3C24XX_SERIAL_NAME, |
955 | .devfs_name = S3C24XX_SERIAL_DEVFS, | ||
956 | .major = S3C24XX_SERIAL_MAJOR, | 954 | .major = S3C24XX_SERIAL_MAJOR, |
957 | .minor = S3C24XX_SERIAL_MINOR, | 955 | .minor = S3C24XX_SERIAL_MINOR, |
958 | }; | 956 | }; |
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 = { | |||
816 | .owner = THIS_MODULE, | 816 | .owner = THIS_MODULE, |
817 | .driver_name = "ttySA", | 817 | .driver_name = "ttySA", |
818 | .dev_name = "ttySA", | 818 | .dev_name = "ttySA", |
819 | .devfs_name = "ttySA", | ||
820 | .major = SERIAL_SA1100_MAJOR, | 819 | .major = SERIAL_SA1100_MAJOR, |
821 | .minor = MINOR_START, | 820 | .minor = MINOR_START, |
822 | .nr = NR_PORTS, | 821 | .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) | |||
2153 | 2153 | ||
2154 | normal->owner = drv->owner; | 2154 | normal->owner = drv->owner; |
2155 | normal->driver_name = drv->driver_name; | 2155 | normal->driver_name = drv->driver_name; |
2156 | normal->devfs_name = drv->devfs_name; | ||
2157 | normal->name = drv->dev_name; | 2156 | normal->name = drv->dev_name; |
2158 | normal->major = drv->major; | 2157 | normal->major = drv->major; |
2159 | normal->minor_start = drv->minor; | 2158 | normal->minor_start = drv->minor; |
@@ -2312,7 +2311,7 @@ int uart_remove_one_port(struct uart_driver *drv, struct uart_port *port) | |||
2312 | mutex_unlock(&state->mutex); | 2311 | mutex_unlock(&state->mutex); |
2313 | 2312 | ||
2314 | /* | 2313 | /* |
2315 | * Remove the devices from devfs | 2314 | * Remove the devices from the tty layer |
2316 | */ | 2315 | */ |
2317 | tty_unregister_device(drv->tty_driver, port->line); | 2316 | tty_unregister_device(drv->tty_driver, port->line); |
2318 | 2317 | ||
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"; | |||
69 | #if !defined(CONFIG_SERIAL_TXX9_STDSERIAL) | 69 | #if !defined(CONFIG_SERIAL_TXX9_STDSERIAL) |
70 | /* "ttyS" is used for standard serial driver */ | 70 | /* "ttyS" is used for standard serial driver */ |
71 | #define TXX9_TTY_NAME "ttyTX" | 71 | #define TXX9_TTY_NAME "ttyTX" |
72 | #define TXX9_TTY_DEVFS_NAME "tttx/" | ||
73 | #define TXX9_TTY_MINOR_START (64 + 64) /* ttyTX0(128), ttyTX1(129) */ | 72 | #define TXX9_TTY_MINOR_START (64 + 64) /* ttyTX0(128), ttyTX1(129) */ |
74 | #else | 73 | #else |
75 | /* acts like standard serial driver */ | 74 | /* acts like standard serial driver */ |
76 | #define TXX9_TTY_NAME "ttyS" | 75 | #define TXX9_TTY_NAME "ttyS" |
77 | #define TXX9_TTY_DEVFS_NAME "tts/" | ||
78 | #define TXX9_TTY_MINOR_START 64 | 76 | #define TXX9_TTY_MINOR_START 64 |
79 | #endif | 77 | #endif |
80 | #define TXX9_TTY_MAJOR TTY_MAJOR | 78 | #define TXX9_TTY_MAJOR TTY_MAJOR |
@@ -971,7 +969,6 @@ console_initcall(serial_txx9_console_init); | |||
971 | static struct uart_driver serial_txx9_reg = { | 969 | static struct uart_driver serial_txx9_reg = { |
972 | .owner = THIS_MODULE, | 970 | .owner = THIS_MODULE, |
973 | .driver_name = "serial_txx9", | 971 | .driver_name = "serial_txx9", |
974 | .devfs_name = TXX9_TTY_DEVFS_NAME, | ||
975 | .dev_name = TXX9_TTY_NAME, | 972 | .dev_name = TXX9_TTY_NAME, |
976 | .major = TXX9_TTY_MAJOR, | 973 | .major = TXX9_TTY_MAJOR, |
977 | .minor = TXX9_TTY_MINOR_START, | 974 | .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 = | |||
1699 | static struct uart_driver sci_uart_driver = { | 1699 | static struct uart_driver sci_uart_driver = { |
1700 | .owner = THIS_MODULE, | 1700 | .owner = THIS_MODULE, |
1701 | .driver_name = "sci", | 1701 | .driver_name = "sci", |
1702 | #ifdef CONFIG_DEVFS_FS | ||
1703 | .devfs_name = "ttsc/", | ||
1704 | #endif | ||
1705 | .dev_name = "ttySC", | 1702 | .dev_name = "ttySC", |
1706 | .major = SCI_MAJOR, | 1703 | .major = SCI_MAJOR, |
1707 | .minor = SCI_MINOR_START, | 1704 | .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 = { | |||
353 | static struct uart_driver sunhv_reg = { | 353 | static struct uart_driver sunhv_reg = { |
354 | .owner = THIS_MODULE, | 354 | .owner = THIS_MODULE, |
355 | .driver_name = "serial", | 355 | .driver_name = "serial", |
356 | .devfs_name = "tts/", | ||
357 | .dev_name = "ttyS", | 356 | .dev_name = "ttyS", |
358 | .major = TTY_MAJOR, | 357 | .major = TTY_MAJOR, |
359 | }; | 358 | }; |
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 = { | |||
851 | static struct uart_driver sunsab_reg = { | 851 | static struct uart_driver sunsab_reg = { |
852 | .owner = THIS_MODULE, | 852 | .owner = THIS_MODULE, |
853 | .driver_name = "serial", | 853 | .driver_name = "serial", |
854 | .devfs_name = "tts/", | ||
855 | .dev_name = "ttyS", | 854 | .dev_name = "ttyS", |
856 | .major = TTY_MAJOR, | 855 | .major = TTY_MAJOR, |
857 | }; | 856 | }; |
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: | |||
1265 | static struct uart_driver sunsu_reg = { | 1265 | static struct uart_driver sunsu_reg = { |
1266 | .owner = THIS_MODULE, | 1266 | .owner = THIS_MODULE, |
1267 | .driver_name = "serial", | 1267 | .driver_name = "serial", |
1268 | .devfs_name = "tts/", | ||
1269 | .dev_name = "ttyS", | 1268 | .dev_name = "ttyS", |
1270 | .major = TTY_MAJOR, | 1269 | .major = TTY_MAJOR, |
1271 | }; | 1270 | }; |
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; | |||
1017 | static struct uart_driver sunzilog_reg = { | 1017 | static struct uart_driver sunzilog_reg = { |
1018 | .owner = THIS_MODULE, | 1018 | .owner = THIS_MODULE, |
1019 | .driver_name = "ttyS", | 1019 | .driver_name = "ttyS", |
1020 | .devfs_name = "tts/", | ||
1021 | .dev_name = "ttyS", | 1020 | .dev_name = "ttyS", |
1022 | .major = TTY_MAJOR, | 1021 | .major = TTY_MAJOR, |
1023 | }; | 1022 | }; |
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 = { | |||
468 | static struct uart_driver v850e_uart_driver = { | 468 | static struct uart_driver v850e_uart_driver = { |
469 | .owner = THIS_MODULE, | 469 | .owner = THIS_MODULE, |
470 | .driver_name = "v850e_uart", | 470 | .driver_name = "v850e_uart", |
471 | .devfs_name = "tts/", | ||
472 | .dev_name = "ttyS", | 471 | .dev_name = "ttyS", |
473 | .major = TTY_MAJOR, | 472 | .major = TTY_MAJOR, |
474 | .minor = V850E_UART_MINOR_BASE, | 473 | .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 = { | |||
911 | .owner = THIS_MODULE, | 911 | .owner = THIS_MODULE, |
912 | .driver_name = "SIU", | 912 | .driver_name = "SIU", |
913 | .dev_name = "ttyVR", | 913 | .dev_name = "ttyVR", |
914 | .devfs_name = "ttvr/", | ||
915 | .major = SIU_MAJOR, | 914 | .major = SIU_MAJOR, |
916 | .minor = SIU_MINOR_BASE, | 915 | .minor = SIU_MINOR_BASE, |
917 | .cons = SERIAL_VR41XX_CONSOLE, | 916 | .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 { | |||
336 | struct module *owner; | 336 | struct module *owner; |
337 | const char *driver_name; | 337 | const char *driver_name; |
338 | const char *dev_name; | 338 | const char *dev_name; |
339 | const char *devfs_name; | ||
340 | int major; | 339 | int major; |
341 | int minor; | 340 | int minor; |
342 | int nr; | 341 | int nr; |