27 files changed, 49 insertions, 108 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/68328serial.c b/drivers/serial/68328serial.c
index b88a7c1158af..bff94541991c 100644
--- a/drivers/serial/68328serial.c
+++ b/drivers/serial/68328serial.c
@@ -131,17 +131,6 @@ static int m68328_console_baud    = CONSOLE_BAUD_RATE;
 static int m68328_console_cbaud   = DEFAULT_CBAUD;
 
 
-/*
- * tmp_buf is used as a temporary buffer by serial_write.  We need to
- * lock it in case the memcpy_fromfs blocks while swapping in a page,
- * and some other program tries to do a serial write at the same time.
- * Since the lock will only come under contention when the system is
- * swapping and available memory is low, it makes sense to share one
- * buffer across all the serial ports, since it significantly saves
- * memory if large numbers of serial ports are open.
- */
-static unsigned char tmp_buf[SERIAL_XMIT_SIZE]; /* This is cheating */
-
 static inline int serial_paranoia_check(struct m68k_serial *info,
                                         char *name, const char *routine)
 {
@@ -211,16 +200,16 @@ static void rs_stop(struct tty_struct *tty)
         if (serial_paranoia_check(info, tty->name, "rs_stop"))
                 return;
         
-        save_flags(flags); cli();
+        local_irq_save(flags);
         uart->ustcnt &= ~USTCNT_TXEN;
-        restore_flags(flags);
+        local_irq_restore(flags);
 }
 
 static void rs_put_char(char ch)
 {
         int flags, loops = 0;
 
-        save_flags(flags); cli();
+        local_irq_save(flags);
 
         while (!(UTX & UTX_TX_AVAIL) && (loops < 1000)) {
                 loops++;
@@ -229,7 +218,7 @@ static void rs_put_char(char ch)
 
         UTX_TXDATA = ch;
         udelay(5);
-        restore_flags(flags);
+        local_irq_restore(flags);
 }
 
 static void rs_start(struct tty_struct *tty)
@@ -241,7 +230,7 @@ static void rs_start(struct tty_struct *tty)
         if (serial_paranoia_check(info, tty->name, "rs_start"))
                 return;
         
-        save_flags(flags); cli();
+        local_irq_save(flags);
         if (info->xmit_cnt && info->xmit_buf && !(uart->ustcnt & USTCNT_TXEN)) {
 #ifdef USE_INTS
                 uart->ustcnt |= USTCNT_TXEN | USTCNT_TX_INTR_MASK;
@@ -249,7 +238,7 @@ static void rs_start(struct tty_struct *tty)
                 uart->ustcnt |= USTCNT_TXEN;
 #endif
         }
-        restore_flags(flags);
+        local_irq_restore(flags);
 }
 
 /* Drop into either the boot monitor or kadb upon receiving a break
@@ -327,14 +316,6 @@ static void receive_chars(struct m68k_serial *info, struct pt_regs *regs,
                 if(!tty)
                         goto clear_and_exit;
                 
-                /*
-                 * Make sure that we do not overflow the buffer
-                 */
-                if (tty_request_buffer_room(tty, 1) == 0) {
-                        tty_schedule_flip(tty);
-                        return;
-                }
-
                 flag = TTY_NORMAL;
 
                 if(rx & URX_PARITY_ERROR) {
@@ -473,7 +454,7 @@ static int startup(struct m68k_serial * info)
                         return -ENOMEM;
         }
 
-        save_flags(flags); cli();
+        local_irq_save(flags);
 
         /*
          * Clear the FIFO buffers and disable them
@@ -506,7 +487,7 @@ static int startup(struct m68k_serial * info)
         change_speed(info);
 
         info->flags |= S_INITIALIZED;
-        restore_flags(flags);
+        local_irq_restore(flags);
         return 0;
 }
 
@@ -523,7 +504,7 @@ static void shutdown(struct m68k_serial * info)
         if (!(info->flags & S_INITIALIZED))
                 return;
 
-        save_flags(flags); cli(); /* Disable interrupts */
+        local_irq_save(flags);
         
         if (info->xmit_buf) {
                 free_page((unsigned long) info->xmit_buf);
@@ -534,7 +515,7 @@ static void shutdown(struct m68k_serial * info)
                 set_bit(TTY_IO_ERROR, &info->tty->flags);
         
         info->flags &= ~S_INITIALIZED;
-        restore_flags(flags);
+        local_irq_restore(flags);
 }
 
 struct {
@@ -655,24 +636,24 @@ static void rs_fair_output(void)
         if (info == 0) return;
         if (info->xmit_buf == 0) return;
 
-        save_flags(flags);  cli();
+        local_irq_save(flags);
         left = info->xmit_cnt;
         while (left != 0) {
                 c = info->xmit_buf[info->xmit_tail];
                 info->xmit_tail = (info->xmit_tail+1) & (SERIAL_XMIT_SIZE-1);
                 info->xmit_cnt--;
-                restore_flags(flags);
+                local_irq_restore(flags);
 
                 rs_put_char(c);
 
-                save_flags(flags);  cli();
+                local_irq_save(flags);
                 left = min(info->xmit_cnt, left-1);
         }
 
         /* Last character is being transmitted now (hopefully). */
         udelay(5);
 
-        restore_flags(flags);
+        local_irq_restore(flags);
         return;
 }
 
@@ -720,11 +701,11 @@ static void rs_flush_chars(struct tty_struct *tty)
 #endif
 
         /* Enable transmitter */
-        save_flags(flags); cli();
+        local_irq_save(flags);
 
         if (info->xmit_cnt <= 0 || tty->stopped || tty->hw_stopped ||
                         !info->xmit_buf) {
-                restore_flags(flags);
+                local_irq_restore(flags);
                 return;
         }
 
@@ -749,7 +730,7 @@ static void rs_flush_chars(struct tty_struct *tty)
         while (!(uart->utx.w & UTX_TX_AVAIL)) udelay(5);
         }
 #endif
-        restore_flags(flags);
+        local_irq_restore(flags);
 }
 
 extern void console_printn(const char * b, int count);
@@ -768,18 +749,22 @@ static int rs_write(struct tty_struct * tty,
         if (!tty || !info->xmit_buf)
                 return 0;
 
-        save_flags(flags);
+        local_save_flags(flags);
         while (1) {
-                cli();          
+                local_irq_disable();            
                 c = min_t(int, count, min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
                                    SERIAL_XMIT_SIZE - info->xmit_head));
+                local_irq_restore(flags);
+
                 if (c <= 0)
                         break;
 
                 memcpy(info->xmit_buf + info->xmit_head, buf, c);
+
+                local_irq_disable();
                 info->xmit_head = (info->xmit_head + c) & (SERIAL_XMIT_SIZE-1);
                 info->xmit_cnt += c;
-                restore_flags(flags);
+                local_irq_restore(flags);
                 buf += c;
                 count -= c;
                 total += c;
@@ -787,7 +772,7 @@ static int rs_write(struct tty_struct * tty,
 
         if (info->xmit_cnt && !tty->stopped && !tty->hw_stopped) {
                 /* Enable transmitter */
-                cli();          
+                local_irq_disable();            
 #ifndef USE_INTS
                 while(info->xmit_cnt) {
 #endif
@@ -807,9 +792,9 @@ static int rs_write(struct tty_struct * tty,
 #ifndef USE_INTS
                 }
 #endif
-                restore_flags(flags);
+                local_irq_restore(flags);
         }
-        restore_flags(flags);
+
         return total;
 }
 
@@ -838,12 +823,13 @@ static int rs_chars_in_buffer(struct tty_struct *tty)
 static void rs_flush_buffer(struct tty_struct *tty)
 {
         struct m68k_serial *info = (struct m68k_serial *)tty->driver_data;
+        unsigned long flags;
                                 
         if (serial_paranoia_check(info, tty->name, "rs_flush_buffer"))
                 return;
-        cli();
+        local_irq_save(flags);
         info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
-        sti();
+        local_irq_restore(flags);
         tty_wakeup(tty);
 }
 
@@ -973,14 +959,15 @@ static int get_lsr_info(struct m68k_serial * info, unsigned int *value)
         m68328_uart *uart = &uart_addr[info->line];
 #endif
         unsigned char status;
+        unsigned long flags;
 
-        cli();
+        local_irq_save(flags);
 #ifdef CONFIG_SERIAL_68328_RTS_CTS
         status = (uart->utx.w & UTX_CTS_STAT) ? 1 : 0;
 #else
         status = 0;
 #endif
-        sti();
+        local_irq_restore(flags);
         put_user(status,value);
         return 0;
 }
@@ -994,14 +981,13 @@ static void send_break(struct m68k_serial * info, unsigned int duration)
         unsigned long flags;
         if (!info->port)
                 return;
-        save_flags(flags);
-        cli();
+        local_irq_save(flags);
 #ifdef USE_INTS 
         uart->utx.w |= UTX_SEND_BREAK;
         msleep_interruptible(duration);
         uart->utx.w &= ~UTX_SEND_BREAK;
 #endif          
-        restore_flags(flags);
+        local_irq_restore(flags);
 }
 
 static int rs_ioctl(struct tty_struct *tty, struct file * file,
@@ -1060,7 +1046,7 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file,
                                                (struct serial_struct *) arg);
                 case TIOCSERGETLSR: /* Get line status register */
                         if (access_ok(VERIFY_WRITE, (void *) arg,
-                                                sizeof(unsigned int));
+                                                sizeof(unsigned int)))
                                 return get_lsr_info(info, (unsigned int *) arg);
                         return -EFAULT;
                 case TIOCSERGSTRUCT:
@@ -1113,10 +1099,10 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
         if (!info || serial_paranoia_check(info, tty->name, "rs_close"))
                 return;
         
-        save_flags(flags); cli();
+        local_irq_save(flags);
         
         if (tty_hung_up_p(filp)) {
-                restore_flags(flags);
+                local_irq_restore(flags);
                 return;
         }
         
@@ -1138,7 +1124,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
                 info->count = 0;
         }
         if (info->count) {
-                restore_flags(flags);
+                local_irq_restore(flags);
                 return;
         }
         info->flags |= S_CLOSING;
@@ -1186,7 +1172,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
         }
         info->flags &= ~(S_NORMAL_ACTIVE|S_CLOSING);
         wake_up_interruptible(&info->close_wait);
-        restore_flags(flags);
+        local_irq_restore(flags);
 }
 
 /*
@@ -1262,9 +1248,9 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
         info->count--;
         info->blocked_open++;
         while (1) {
-                cli();
+                local_irq_disable();
                 m68k_rtsdtr(info, 1);
-                sti();
+                local_irq_enable();
                 current->state = TASK_INTERRUPTIBLE;
                 if (tty_hung_up_p(filp) ||
                     !(info->flags & S_INITIALIZED)) {
@@ -1444,7 +1430,7 @@ rs68328_init(void)
                 return -ENOMEM;
         }
 
-        save_flags(flags); cli();
+        local_irq_save(flags);
 
         for(i=0;i<NR_PORTS;i++) {
 
@@ -1489,7 +1475,7 @@ rs68328_init(void)
                     serial_pm[i]->data = info;
 #endif
         }
-        restore_flags(flags);
+        local_irq_restore(flags);
         return 0;
 }
 
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/8250_pci.c b/drivers/serial/8250_pci.c
index 94886c000d2a..864ef859be56 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -594,8 +594,8 @@ pci_default_setup(struct serial_private *priv, struct pciserial_board *board,
         else
                 offset += idx * board->uart_offset;
 
-        maxnr = (pci_resource_len(priv->dev, bar) - board->first_offset) /
-                (8 << board->reg_shift);
+        maxnr = (pci_resource_len(priv->dev, bar) - board->first_offset) >>
+                (board->reg_shift + 3);
 
         if (board->flags & FL_REGION_SZ_CAP && idx >= maxnr)
                 return 1;
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/crisv10.c b/drivers/serial/crisv10.c
index 89700141f87e..b84137cdeb2b 100644
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -2573,12 +2573,6 @@ static void flush_to_flip_buffer(struct e100_serial *info)
 
         DFLIP(
           if (1) {
-
-                  if (test_bit(TTY_DONT_FLIP, &tty->flags)) {
-                          DEBUG_LOG(info->line, "*** TTY_DONT_FLIP set flip.count %i ***\n", tty->flip.count);
-                          DEBUG_LOG(info->line, "*** recv_cnt %i\n", info->recv_cnt);
-                  } else {
-                  }
                   DEBUG_LOG(info->line, "*** rxtot %i\n", info->icount.rx);
                   DEBUG_LOG(info->line, "ldisc %lu\n", tty->ldisc.chars_in_buffer(tty));
                   DEBUG_LOG(info->line, "room  %lu\n", tty->ldisc.receive_room(tty));
@@ -4884,7 +4878,7 @@ rs_init(void)
         driver->init_termios = tty_std_termios;
         driver->init_termios.c_cflag =
                 B115200 | CS8 | CREAD | HUPCL | CLOCAL; /* is normally B9600 default... */
-        driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS;
+        driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
         driver->termios = serial_termios;
         driver->termios_locked = serial_termios_locked;
 
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/jsm/jsm_tty.c b/drivers/serial/jsm/jsm_tty.c
index 7d823705193c..f8262e6ad8d3 100644
--- a/drivers/serial/jsm/jsm_tty.c
+++ b/drivers/serial/jsm/jsm_tty.c
@@ -589,13 +589,6 @@ void jsm_input(struct jsm_channel *ch)
         ld = tty_ldisc_ref(tp);
 
         /*
-         * If the DONT_FLIP flag is on, don't flush our buffer, and act
-         * like the ld doesn't have any space to put the data right now.
-         */
-        if (test_bit(TTY_DONT_FLIP, &tp->flags))
-                len = 0;
-
-        /*
          * If we were unable to get a reference to the ld,
          * don't flush our buffer, and act like the ld doesn't
          * have any space to put the data right now.
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..7dc1e67b6851 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;
@@ -2161,7 +2160,7 @@ int uart_register_driver(struct uart_driver *drv)
         normal->subtype         = SERIAL_TYPE_NORMAL;
         normal->init_termios    = tty_std_termios;
         normal->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;
-        normal->flags           = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS;
+        normal->flags           = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
         normal->driver_state    = drv;
         tty_set_operations(normal, &uart_ops);
 
@@ -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,