diff options
35 files changed, 96 insertions, 120 deletions
diff --git a/arch/mips/au1000/common/serial.c b/arch/mips/au1000/common/serial.c index aa63d311fe7f..18c4a99f6dcc 100644 --- a/arch/mips/au1000/common/serial.c +++ b/arch/mips/au1000/common/serial.c @@ -2588,7 +2588,7 @@ static int __init rs_init(void) serial_driver.magic = TTY_DRIVER_MAGIC; serial_driver.driver_name = "serial"; #if (LINUX_VERSION_CODE > 0x2032D && defined(CONFIG_DEVFS_FS)) - serial_driver.name = "tts/%d"; + serial_driver.name = "tts/"; #else serial_driver.name = "ttyS"; #endif @@ -2632,7 +2632,7 @@ static int __init rs_init(void) */ callout_driver = serial_driver; #if (LINUX_VERSION_CODE > 0x2032D && defined(CONFIG_DEVFS_FS)) - callout_driver.name = "cua/%d"; + callout_driver.name = "cua/"; #else callout_driver.name = "cua"; #endif @@ -2681,10 +2681,8 @@ static int __init rs_init(void) (state->flags & ASYNC_FOURPORT) ? " FourPort" : "", state->port, state->irq, uart_config[state->type].name); - tty_register_device(&serial_driver, - serial_driver.minor_start + state->line); - tty_register_device(&callout_driver, - callout_driver.minor_start + state->line); + tty_register_device(&serial_driver, state->line); + tty_register_device(&callout_driver, state->line); } return 0; } @@ -2771,10 +2769,8 @@ int register_serial(struct serial_struct *req) state->iomem_base ? "iomem" : "port", state->iomem_base ? (unsigned long)state->iomem_base : state->port, state->irq, uart_config[state->type].name); - tty_register_device(&serial_driver, - serial_driver.minor_start + state->line); - tty_register_device(&callout_driver, - callout_driver.minor_start + state->line); + tty_register_device(&serial_driver, state->line); + tty_register_device(&callout_driver, state->line); return state->line + SERIAL_DEV_OFFSET; } @@ -2800,10 +2796,8 @@ void unregister_serial(int line) /* These will be hidden, because they are devices that will no longer * be available to the system. (ie, PCMCIA modems, once ejected) */ - tty_unregister_device(&serial_driver, - serial_driver.minor_start + state->line); - tty_unregister_device(&callout_driver, - callout_driver.minor_start + state->line); + tty_unregister_device(&serial_driver, state->line); + tty_unregister_device(&callout_driver, state->line); restore_flags(flags); } diff --git a/arch/ppc/8260_io/uart.c b/arch/ppc/8260_io/uart.c index f0723ac1f83a..f4bdeb11dca0 100644 --- a/arch/ppc/8260_io/uart.c +++ b/arch/ppc/8260_io/uart.c @@ -2506,7 +2506,7 @@ int __init rs_8xx_init(void) serial_driver.magic = TTY_DRIVER_MAGIC; serial_driver.driver_name = "serial"; #ifdef CONFIG_DEVFS_FS - serial_driver.name = "tts/%d"; + serial_driver.name = "tts/"; #else serial_driver.name = "ttyS"; #endif @@ -2548,7 +2548,7 @@ int __init rs_8xx_init(void) */ callout_driver = serial_driver; #ifdef CONFIG_DEVFS_FS - callout_driver.name = "cua/%d"; + callout_driver.name = "cua/"; #else callout_driver.name = "cua"; #endif diff --git a/arch/ppc/8xx_io/uart.c b/arch/ppc/8xx_io/uart.c index 81f74c1aca1c..5111ff2ae617 100644 --- a/arch/ppc/8xx_io/uart.c +++ b/arch/ppc/8xx_io/uart.c @@ -2560,7 +2560,7 @@ int __init rs_8xx_init(void) serial_driver.magic = TTY_DRIVER_MAGIC; serial_driver.driver_name = "serial"; #ifdef CONFIG_DEVFS_FS - serial_driver.name = "tts/%d"; + serial_driver.name = "tts/"; #else serial_driver.name = "ttyS"; #endif @@ -2602,7 +2602,7 @@ int __init rs_8xx_init(void) */ callout_driver = serial_driver; #ifdef CONFIG_DEVFS_FS - callout_driver.name = "cua/%d"; + callout_driver.name = "cua/"; #else callout_driver.name = "cua"; #endif diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c index 82b90a0f8dc5..00c6e9187d8e 100644 --- a/arch/um/drivers/line.c +++ b/arch/um/drivers/line.c @@ -444,7 +444,7 @@ void line_register_devfs(struct lines *set, struct line_driver *line_driver, for(i = 0; i < nlines; i++){ if(!lines[i].valid) - tty_unregister_devfs(driver, driver->minor_start + i); + tty_unregister_devfs(driver, i); } mconsole_register_dev(&line_driver->mc); diff --git a/drivers/char/dz.c b/drivers/char/dz.c index 6c13bdb239ed..f29fb59793e5 100644 --- a/drivers/char/dz.c +++ b/drivers/char/dz.c @@ -1335,7 +1335,7 @@ int __init dz_init(void) #if (LINUX_VERSION_CODE > 0x2032D && defined(CONFIG_DEVFS_FS)) serial_driver.name = "ttyS"; #else - serial_driver.name = "tts/%d"; + serial_driver.name = "tts/"; #endif serial_driver.major = TTY_MAJOR; serial_driver.minor_start = 64; @@ -1376,7 +1376,7 @@ int __init dz_init(void) #if (LINUX_VERSION_CODE > 0x2032D && defined(CONFIG_DEVFS_FS)) callout_driver.name = "cua"; #else - callout_driver.name = "cua/%d"; + callout_driver.name = "cua/"; #endif callout_driver.major = TTYAUX_MAJOR; callout_driver.subtype = SERIAL_TYPE_CALLOUT; @@ -1425,10 +1425,8 @@ int __init dz_init(void) printk("ttyS%02d at 0x%08x (irq = %d)\n", info->line, info->port, SERIAL); - tty_register_device(&serial_driver, - serial_driver.minor_start + info->line); - tty_register_device(&callout_driver, - callout_driver.minor_start + info->line); + tty_register_device(&serial_driver, info->line); + tty_register_device(&callout_driver, info->line); } /* Reset the chip */ diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c index 7c4ef931066d..ed754f3df45f 100644 --- a/drivers/char/hvc_console.c +++ b/drivers/char/hvc_console.c @@ -253,7 +253,7 @@ int __init hvc_init(void) hvc_driver.magic = TTY_DRIVER_MAGIC; hvc_driver.driver_name = "hvc"; - hvc_driver.name = "hvc/%d"; + hvc_driver.name = "hvc/"; hvc_driver.major = HVC_MAJOR; hvc_driver.minor_start = HVC_MINOR; hvc_driver.num = hvc_count(&hvc_offset); @@ -277,7 +277,7 @@ int __init hvc_init(void) for (i = 0; i < hvc_driver.num; i++) { hvc_struct[i].lock = SPIN_LOCK_UNLOCKED; hvc_struct[i].index = i; - tty_register_device(&hvc_driver, hvc_driver.minor_start + i); + tty_register_device(&hvc_driver, i); } if (tty_register_driver(&hvc_driver)) diff --git a/drivers/char/pty.c b/drivers/char/pty.c index 2c4933be5f57..1459910ae5ce 100644 --- a/drivers/char/pty.c +++ b/drivers/char/pty.c @@ -354,7 +354,7 @@ int __init pty_init(void) pty_driver.owner = THIS_MODULE; pty_driver.driver_name = "pty_master"; #ifdef CONFIG_DEVFS_FS - pty_driver.name = "pty/m%d"; + pty_driver.name = "pty/m"; #else pty_driver.name = "pty"; #endif @@ -389,7 +389,7 @@ int __init pty_init(void) pty_slave_driver.driver_name = "pty_slave"; pty_slave_driver.proc_entry = 0; #ifdef CONFIG_DEVFS_FS - pty_slave_driver.name = "pty/s%d"; + pty_slave_driver.name = "pty/s"; #else pty_slave_driver.name = "ttyp"; #endif @@ -451,8 +451,8 @@ int __init pty_init(void) pts_driver[i].minor_start = 0; pts_driver[i].name_base = i*NR_PTYS; pts_driver[i].num = ptm_driver[i].num; - pts_driver[i].other = &ptm_driver[i]; pts_driver[i].flags |= TTY_DRIVER_NO_DEVFS; + pts_driver[i].other = &ptm_driver[i]; pts_driver[i].table = pts_table[i]; pts_driver[i].termios = pts_termios[i]; pts_driver[i].termios_locked = pts_termios_locked[i]; diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c index dac4f77d513d..98db9b9ed166 100644 --- a/drivers/char/rocket.c +++ b/drivers/char/rocket.c @@ -2013,7 +2013,7 @@ int __init rp_init(void) memset(&rocket_driver, 0, sizeof(struct tty_driver)); rocket_driver.magic = TTY_DRIVER_MAGIC; #ifdef CONFIG_DEVFS_FS - rocket_driver.name = "tts/R%d"; + rocket_driver.name = "tts/R"; #else rocket_driver.name = "ttyR"; #endif @@ -2055,7 +2055,7 @@ int __init rp_init(void) */ callout_driver = rocket_driver; #ifdef CONFIG_DEVFS_FS - callout_driver.name = "cua/R%d"; + callout_driver.name = "cua/R"; #else callout_driver.name = "cur"; #endif diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c index 47fd30d627f7..929113786f72 100644 --- a/drivers/char/serial167.c +++ b/drivers/char/serial167.c @@ -2396,7 +2396,7 @@ scrn[1] = '\0'; memset(&cy_serial_driver, 0, sizeof(struct tty_driver)); cy_serial_driver.magic = TTY_DRIVER_MAGIC; #ifdef CONFIG_DEVFS_FS - cy_serial_driver.name = "tts/%d"; + cy_serial_driver.name = "tts/"; #else cy_serial_driver.name = "ttyS"; #endif @@ -2435,7 +2435,7 @@ scrn[1] = '\0'; */ cy_callout_driver = cy_serial_driver; #ifdef CONFIG_DEVFS_FS - cy_callout_driver.name = "cua/%d"; + cy_callout_driver.name = "cua/"; #else cy_callout_driver.name = "cua"; #endif diff --git a/drivers/char/sh-sci.c b/drivers/char/sh-sci.c index 4da69ac114ce..10914fd23943 100644 --- a/drivers/char/sh-sci.c +++ b/drivers/char/sh-sci.c @@ -1021,7 +1021,7 @@ static int sci_init_drivers(void) sci_driver.magic = TTY_DRIVER_MAGIC; sci_driver.driver_name = "sci"; #ifdef CONFIG_DEVFS_FS - sci_driver.name = "ttsc/%d"; + sci_driver.name = "ttsc/"; #else sci_driver.name = "ttySC"; #endif @@ -1060,7 +1060,7 @@ static int sci_init_drivers(void) sci_callout_driver = sci_driver; #ifdef CONFIG_DEVFS_FS - sci_callout_driver.name = "cusc/%d"; + sci_callout_driver.name = "cusc/"; #else sci_callout_driver.name = "cusc"; #endif diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index e9b991cdf922..e25a220850b1 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c @@ -788,6 +788,11 @@ static void up_tty_sem(int index) static void release_mem(struct tty_struct *tty, int idx); +static inline void tty_line_name(struct tty_driver *driver, int index, char *p) +{ + sprintf(p, "%s%d", driver->name, index + driver->name_base); +} + /* * WSH 06/09/97: Rewritten to remove races and properly clean up after a * failed open. The new code protects the open with a semaphore, so it's @@ -843,8 +848,7 @@ static int init_dev(kdev_t device, struct tty_struct **ret_tty) tty->device = device; tty->driver = driver; tty->index = idx; - sprintf(tty->name, "%s%d", - driver->name, idx + driver->name_base); + tty_line_name(driver, idx, tty->name); tp_loc = &driver->termios[idx]; if (!*tp_loc) { @@ -873,8 +877,7 @@ static int init_dev(kdev_t device, struct tty_struct **ret_tty) driver->other->minor_start + idx); o_tty->driver = driver->other; o_tty->index = idx; - sprintf(o_tty->name, "%s%d", - driver->other->name, idx + driver->other->name_base); + tty_line_name(driver->other, idx, o_tty->name); o_tp_loc = &driver->other->termios[idx]; if (!*o_tp_loc) { @@ -2094,11 +2097,11 @@ static void tty_default_put_char(struct tty_struct *tty, unsigned char ch) } #ifdef CONFIG_DEVFS_FS -static void tty_register_devfs(struct tty_driver *driver, unsigned minor) +static void tty_register_devfs(struct tty_driver *driver, unsigned index) { umode_t mode = S_IFCHR | S_IRUSR | S_IWUSR; + unsigned minor = driver->minor_start + index; kdev_t dev = mk_kdev(driver->major, minor); - int idx = minor - driver->minor_start; char buf[32]; if ((minor < driver->minor_start) || @@ -2108,32 +2111,33 @@ static void tty_register_devfs(struct tty_driver *driver, unsigned minor) return; } - sprintf(buf, driver->name, idx + driver->name_base); + tty_line_name(driver, index, buf); devfs_register(NULL, buf, 0, driver->major, minor, mode, &tty_fops, NULL); } -static void tty_unregister_devfs(struct tty_driver *driver, unsigned minor) +static void tty_unregister_devfs(struct tty_driver *driver, int index) { - devfs_remove(driver->name, - minor - driver->minor_start + driver->name_base); + char path[64]; + tty_line_name(driver, index, path); + devfs_remove(path); } #else -# define tty_register_devfs(driver, minor) do { } while (0) -# define tty_unregister_devfs(driver, minor) do { } while (0) +# define tty_register_devfs(driver, index) do { } while (0) +# define tty_unregister_devfs(driver, index) do { } while (0) #endif /* CONFIG_DEVFS_FS */ /* * Register a tty device described by <driver>, with minor number <minor>. */ -void tty_register_device(struct tty_driver *driver, unsigned minor) +void tty_register_device(struct tty_driver *driver, unsigned index) { - tty_register_devfs(driver, minor); + tty_register_devfs(driver, index); } -void tty_unregister_device(struct tty_driver *driver, unsigned minor) +void tty_unregister_device(struct tty_driver *driver, unsigned index) { - tty_unregister_devfs(driver, minor); + tty_unregister_devfs(driver, index); } EXPORT_SYMBOL(tty_register_device); @@ -2164,7 +2168,7 @@ int tty_register_driver(struct tty_driver *driver) if ( !(driver->flags & TTY_DRIVER_NO_DEVFS) ) { for(i = 0; i < driver->num; i++) - tty_register_device(driver, driver->minor_start + i); + tty_register_device(driver, i); } proc_tty_register_driver(driver); return error; @@ -2205,7 +2209,7 @@ int tty_unregister_driver(struct tty_driver *driver) kfree(tp); } if (!(driver->flags & TTY_DRIVER_NO_DEVFS)) - tty_unregister_device(driver, driver->minor_start + i); + tty_unregister_device(driver, i); } proc_tty_unregister_driver(driver); return 0; diff --git a/drivers/char/vme_scc.c b/drivers/char/vme_scc.c index a1083708d250..4b5e55709fa9 100644 --- a/drivers/char/vme_scc.c +++ b/drivers/char/vme_scc.c @@ -131,7 +131,7 @@ static int scc_init_drivers(void) scc_driver.magic = TTY_DRIVER_MAGIC; scc_driver.driver_name = "scc"; #ifdef CONFIG_DEVFS_FS - scc_driver.name = "tts/%d"; + scc_driver.name = "tts/"; #else scc_driver.name = "ttyS"; #endif @@ -168,7 +168,7 @@ static int scc_init_drivers(void) scc_callout_driver = scc_driver; #ifdef CONFIG_DEVFS_FS - scc_callout_driver.name = "cua/%d"; + scc_callout_driver.name = "cua/"; #else scc_callout_driver.name = "cua"; #endif diff --git a/drivers/char/vt.c b/drivers/char/vt.c index dc10de2851ef..a5e75c3d65e4 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c @@ -2515,7 +2515,7 @@ int __init vty_init(void) memset(&console_driver, 0, sizeof(struct tty_driver)); console_driver.magic = TTY_DRIVER_MAGIC; console_driver.owner = THIS_MODULE; - console_driver.name = "vc/%d"; + console_driver.name = "vc/"; console_driver.name_base = 1; console_driver.major = TTY_MAJOR; console_driver.minor_start = 1; @@ -2664,8 +2664,7 @@ static void __init con_init_devfs (void) int i; for (i = 0; i < console_driver.num; i++) - tty_register_device (&console_driver, - console_driver.minor_start + i); + tty_register_device (&console_driver, i); } /* diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c index 4e01b76e1fcb..613282a7a969 100644 --- a/drivers/isdn/capi/capi.c +++ b/drivers/isdn/capi/capi.c @@ -1283,7 +1283,7 @@ static int capinc_tty_init(void) memset(drv, 0, sizeof(struct tty_driver)); drv->magic = TTY_DRIVER_MAGIC; drv->driver_name = "capi_nc"; - drv->name = "capi/%d"; + drv->name = "capi/"; drv->major = capi_ttymajor; drv->minor_start = 0; drv->num = CAPINC_NR_PORTS; diff --git a/drivers/macintosh/macserial.c b/drivers/macintosh/macserial.c index 45902f5e7807..18037963b7e3 100644 --- a/drivers/macintosh/macserial.c +++ b/drivers/macintosh/macserial.c @@ -2607,7 +2607,7 @@ no_dma: serial_driver.magic = TTY_DRIVER_MAGIC; serial_driver.driver_name = "macserial"; #ifdef CONFIG_DEVFS_FS - serial_driver.name = "tts/%d"; + serial_driver.name = "tts/"; #else serial_driver.name = "ttyS"; #endif /* CONFIG_DEVFS_FS */ @@ -2650,7 +2650,7 @@ no_dma: */ callout_driver = serial_driver; #ifdef CONFIG_DEVFS_FS - callout_driver.name = "cua/%d"; + callout_driver.name = "cua/"; #else callout_driver.name = "cua"; #endif /* CONFIG_DEVFS_FS */ diff --git a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c index 4715579235d7..87deb312b94c 100644 --- a/drivers/net/irda/irtty-sir.c +++ b/drivers/net/irda/irtty-sir.c @@ -502,7 +502,6 @@ static int irtty_open(struct tty_struct *tty) { struct sir_dev *dev; struct sirtty_cb *priv; - char hwname[16]; int ret = 0; /* unfortunately, there's no tty_ldisc->owner field @@ -535,23 +534,11 @@ static int irtty_open(struct tty_struct *tty) * tty->ldisc.flush_buffer(tty); */ - - /* create device name - could we use tty_name() here? */ - - if (strchr(tty->driver->name, '%')) { - sprintf(hwname, tty->driver->name, - tty->index + tty->driver->name_base); - } - else { - sprintf(hwname, "%s%d", tty->driver->name, - tty->index + tty->driver->name_base); - } - /* apply mtt override */ sir_tty_drv.qos_mtt_bits = qos_mtt_bits; /* get a sir device instance for this driver */ - dev = sirdev_get_instance(&sir_tty_drv, hwname); + dev = sirdev_get_instance(&sir_tty_drv, tty->name); if (!dev) { ret = -ENODEV; goto out; diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c index 81f9814e113c..01593c1cfd78 100644 --- a/drivers/serial/21285.c +++ b/drivers/serial/21285.c @@ -517,7 +517,7 @@ console_initcall(rs285_console_init); static struct uart_driver serial21285_reg = { .owner = THIS_MODULE, .driver_name = "ttyFB", - .dev_name = "ttyFB%d", + .dev_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 685f11f43a99..4b365700d78f 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c @@ -2003,9 +2003,9 @@ static struct uart_driver serial8250_reg = { .owner = THIS_MODULE, .driver_name = "serial", #ifdef CONFIG_DEVFS_FS - .dev_name = "tts/%d", + .dev_name = "tts/", #else - .dev_name = "ttyS%d", + .dev_name = "ttyS", #endif .major = TTY_MAJOR, .minor = 64, diff --git a/drivers/serial/amba.c b/drivers/serial/amba.c index 543861f31464..e1abc2633196 100644 --- a/drivers/serial/amba.c +++ b/drivers/serial/amba.c @@ -720,7 +720,7 @@ console_initcall(ambauart_console_init); static struct uart_driver amba_reg = { .owner = THIS_MODULE, .driver_name = "ttyAM", - .dev_name = "ttyAM%d", + .dev_name = "ttyAM", .major = SERIAL_AMBA_MAJOR, .minor = SERIAL_AMBA_MINOR, .nr = UART_NR, diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c index 4549d2831bbc..c6952eb73228 100644 --- a/drivers/serial/clps711x.c +++ b/drivers/serial/clps711x.c @@ -581,7 +581,7 @@ console_initcall(clps711xuart_console_init); static struct uart_driver clps711x_reg = { .driver_name = "ttyCL", - .dev_name = "ttyCL%d", + .dev_name = "ttyCL", .major = SERIAL_CLPS711X_MAJOR, .minor = SERIAL_CLPS711X_MINOR, .nr = UART_NR, diff --git a/drivers/serial/core.c b/drivers/serial/core.c index 814ed0c7b0c4..2e585223f1e6 100644 --- a/drivers/serial/core.c +++ b/drivers/serial/core.c @@ -1960,7 +1960,7 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port, u32 level) static inline void uart_report_port(struct uart_driver *drv, struct uart_port *port) { - printk(drv->dev_name, port->line); + printk("%s%d", drv->dev_name, port->line); printk(" at "); switch (port->iotype) { case UPIO_PORT: @@ -2234,7 +2234,7 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *port) * Register the port whether it's detected or not. This allows * setserial to be used to alter this ports parameters. */ - tty_register_device(drv->tty_driver, drv->minor + port->line); + tty_register_device(drv->tty_driver, port->line); out: up(&port_sem); @@ -2266,7 +2266,7 @@ int uart_remove_one_port(struct uart_driver *drv, struct uart_port *port) /* * Remove the devices from devfs */ - tty_unregister_device(drv->tty_driver, drv->minor + port->line); + tty_unregister_device(drv->tty_driver, port->line); uart_unconfigure_port(drv, state); state->port = NULL; @@ -2413,7 +2413,7 @@ void uart_unregister_port(struct uart_driver *drv, int line) if (line < 0 || line >= drv->nr) { printk(KERN_ERR "Attempt to unregister "); - printk(drv->dev_name, line); + printk("%s%d", drv->dev_name, line); printk("\n"); return; } diff --git a/drivers/serial/mux.c b/drivers/serial/mux.c index 26d884a3189d..7c789e0f5743 100644 --- a/drivers/serial/mux.c +++ b/drivers/serial/mux.c @@ -456,7 +456,7 @@ static int __init mux_probe(struct parisc_device *dev) card->drv.owner = THIS_MODULE; card->drv.driver_name = "ttyB"; - card->drv.dev_name = "ttyB%d"; + card->drv.dev_name = "ttyB"; card->drv.major = MUX_MAJOR; card->drv.minor = port_cnt; card->drv.nr = UART_NR; diff --git a/drivers/serial/nb85e_uart.c b/drivers/serial/nb85e_uart.c index 5f129fce1977..97f664e08f5f 100644 --- a/drivers/serial/nb85e_uart.c +++ b/drivers/serial/nb85e_uart.c @@ -528,7 +528,7 @@ static struct uart_driver nb85e_uart_driver = { .owner = THIS_MODULE, .driver_name = "nb85e_uart", #ifdef CONFIG_DEVFS_FS - .dev_name = "tts/%d", + .dev_name = "tts/", #else .dev_name = "ttyS", #endif diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c index 010cf9dc7571..6df20e91174c 100644 --- a/drivers/serial/sa1100.c +++ b/drivers/serial/sa1100.c @@ -852,7 +852,7 @@ console_initcall(sa1100_rs_console_init); static struct uart_driver sa1100_reg = { .owner = THIS_MODULE, .driver_name = "ttySA", - .dev_name = "ttySA%d", + .dev_name = "ttySA", .major = SERIAL_SA1100_MAJOR, .minor = MINOR_START, .nr = NR_PORTS, diff --git a/drivers/serial/serial98.c b/drivers/serial/serial98.c index d53f85706a18..9b597943de06 100644 --- a/drivers/serial/serial98.c +++ b/drivers/serial/serial98.c @@ -156,7 +156,7 @@ static struct console serial98_console = { static struct uart_driver serial98_reg = { .owner = THIS_MODULE, .driver_name = "serial98", - .dev_name = "ttyS%d", + .dev_name = "ttyS", .major = TTY_MAJOR, .minor = 64, .nr = SERIAL98_NR, diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c index d239dfcf91b4..9c464d9c698b 100644 --- a/drivers/serial/sunsab.c +++ b/drivers/serial/sunsab.c @@ -828,9 +828,9 @@ static struct uart_driver sunsab_reg = { .owner = THIS_MODULE, .driver_name = "serial", #ifdef CONFIG_DEVFS_FS - .dev_name = "tts/%d", + .dev_name = "tts/", #else - .dev_name = "ttyS%d", + .dev_name = "ttyS", #endif .major = TTY_MAJOR, }; diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c index 823377b4d562..b52734b30e71 100644 --- a/drivers/serial/sunsu.c +++ b/drivers/serial/sunsu.c @@ -1286,9 +1286,9 @@ static struct uart_driver sunsu_reg = { .owner = THIS_MODULE, .driver_name = "serial", #ifdef CONFIG_DEVFS_FS - .dev_name = "tts/%d", + .dev_name = "tts/", #else - .dev_name = "ttyS%d", + .dev_name = "ttyS", #endif .major = TTY_MAJOR, }; diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c index 99135a437fe2..7fa1c7a484d6 100644 --- a/drivers/serial/sunzilog.c +++ b/drivers/serial/sunzilog.c @@ -1031,9 +1031,9 @@ static struct uart_driver sunzilog_reg = { .owner = THIS_MODULE, .driver_name = "ttyS", #ifdef CONFIG_DEVFS_FS - .dev_name = "tts/%d", + .dev_name = "tts/", #else - .dev_name = "ttyS%d", + .dev_name = "ttyS", #endif .major = TTY_MAJOR, }; diff --git a/drivers/tc/zs.c b/drivers/tc/zs.c index dfc46477eb5d..7438b5b749da 100644 --- a/drivers/tc/zs.c +++ b/drivers/tc/zs.c @@ -1873,7 +1873,7 @@ int __init zs_init(void) memset(&serial_driver, 0, sizeof(struct tty_driver)); serial_driver.magic = TTY_DRIVER_MAGIC; #if (LINUX_VERSION_CODE > 0x2032D && defined(CONFIG_DEVFS_FS)) - serial_driver.name = "tts/%d"; + serial_driver.name = "tts/"; #else serial_driver.name = "ttyS"; #endif @@ -1915,7 +1915,7 @@ int __init zs_init(void) */ callout_driver = serial_driver; #if (LINUX_VERSION_CODE > 0x2032D && defined(CONFIG_DEVFS_FS)) - callout_driver.name = "cua/%d"; + callout_driver.name = "cua/"; #else callout_driver.name = "cua"; #endif @@ -1970,10 +1970,8 @@ int __init zs_init(void) printk("ttyS%02d at 0x%08x (irq = %d)", info->line, info->port, info->irq); printk(" is a Z85C30 SCC\n"); - tty_register_device(&serial_driver, - serial_driver.minor_start + info->line); - tty_register_device(&callout_driver, - callout_driver.minor_start + info->line); + tty_register_device(&serial_driver, info->line); + tty_register_device(&callout_driver, info->line); } diff --git a/drivers/usb/class/bluetty.c b/drivers/usb/class/bluetty.c index b83068f9f13a..54a7f8082c2f 100644 --- a/drivers/usb/class/bluetty.c +++ b/drivers/usb/class/bluetty.c @@ -276,9 +276,9 @@ static inline struct usb_bluetooth* get_usb_bluetooth (struct usb_bluetooth *blu } -static inline struct usb_bluetooth *get_bluetooth_by_minor (int minor) +static inline struct usb_bluetooth *get_bluetooth_by_index (int index) { - return bluetooth_table[minor]; + return bluetooth_table[index]; } @@ -357,7 +357,7 @@ static int bluetooth_open (struct tty_struct *tty, struct file * filp) tty->driver_data = NULL; /* get the bluetooth object associated with this tty pointer */ - bluetooth = get_bluetooth_by_minor (minor(tty->device)); + bluetooth = get_bluetooth_by_index (tty->index); if (bluetooth_paranoia_check (bluetooth, __FUNCTION__)) { return -ENODEV; @@ -1298,7 +1298,7 @@ static struct tty_driver bluetooth_tty_driver = { .magic = TTY_DRIVER_MAGIC, .owner = THIS_MODULE, .driver_name = "usb-bluetooth", - .name = "usb/ttub/%d", + .name = "usb/ttub/", .major = BLUETOOTH_TTY_MAJOR, .minor_start = 0, .num = BLUETOOTH_TTY_MINORS, diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 99233f6f06ef..5b4c421ffb04 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -313,7 +313,7 @@ static void acm_softint(void *private) static int acm_tty_open(struct tty_struct *tty, struct file *filp) { - struct acm *acm = acm_table[minor(tty->device)]; + struct acm *acm = acm_table[tty->index]; if (!acm || !acm->dev) return -EINVAL; @@ -727,7 +727,7 @@ static struct tty_driver acm_tty_driver = { .magic = TTY_DRIVER_MAGIC, .owner = THIS_MODULE, .driver_name = "acm", - .name = "usb/acm/%d", + .name = "usb/acm/", .major = ACM_TTY_MAJOR, .minor_start = 0, .num = ACM_TTY_MINORS, diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index c4bfe0b59ba5..9f167a416fef 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c @@ -389,9 +389,9 @@ static struct usb_serial *serial_table[SERIAL_TTY_MINORS]; /* initially all NULL static LIST_HEAD(usb_serial_driver_list); -struct usb_serial *usb_serial_get_by_minor (unsigned int minor) +struct usb_serial *usb_serial_get_by_index(unsigned index) { - struct usb_serial *serial = serial_table[minor]; + struct usb_serial *serial = serial_table[index]; if (serial) kobject_get (&serial->kobj); @@ -462,13 +462,13 @@ static int serial_open (struct tty_struct *tty, struct file * filp) tty->driver_data = NULL; /* get the serial object associated with this tty pointer */ - serial = usb_serial_get_by_minor (minor(tty->device)); + serial = usb_serial_get_by_index(tty->index); if (serial_paranoia_check (serial, __FUNCTION__)) return -ENODEV; /* set up our port structure making the tty driver remember our port object, and us it */ - portNumber = minor(tty->device) - serial->minor; + portNumber = tty->index - serial->minor; port = &serial->port[portNumber]; tty->driver_data = port; @@ -753,7 +753,7 @@ static int serial_read_proc (char *page, char **start, off_t off, int count, int dbg("%s", __FUNCTION__); length += sprintf (page, "usbserinfo:1.0 driver:%s\n", DRIVER_VERSION); for (i = 0; i < SERIAL_TTY_MINORS && length < PAGE_SIZE; ++i) { - serial = usb_serial_get_by_minor(i); + serial = usb_serial_get_by_index(i); if (serial == NULL) continue; @@ -1261,7 +1261,7 @@ struct tty_driver usb_serial_tty_driver = { #ifndef CONFIG_DEVFS_FS .name = "ttyUSB", #else - .name = "usb/tts/%d", + .name = "usb/tts/", #endif .major = SERIAL_TTY_MAJOR, .minor_start = 0, diff --git a/include/linux/tty.h b/include/linux/tty.h index de633b4b551b..eaa682168a7a 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -380,8 +380,8 @@ extern void start_tty(struct tty_struct * tty); extern int tty_register_ldisc(int disc, struct tty_ldisc *new_ldisc); extern int tty_register_driver(struct tty_driver *driver); extern int tty_unregister_driver(struct tty_driver *driver); -extern void tty_register_device(struct tty_driver *driver, unsigned minor); -extern void tty_unregister_device(struct tty_driver *driver, unsigned minor); +extern void tty_register_device(struct tty_driver *driver, unsigned index); +extern void tty_unregister_device(struct tty_driver *driver, unsigned index); extern int tty_read_raw_data(struct tty_struct *tty, unsigned char *bufp, int buflen); extern void tty_write_message(struct tty_struct *tty, char *msg); diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c index 4ef753de4ae6..ccc1237945c0 100644 --- a/net/bluetooth/rfcomm/tty.c +++ b/net/bluetooth/rfcomm/tty.c @@ -852,7 +852,7 @@ static struct tty_driver rfcomm_tty_driver = { .magic = TTY_DRIVER_MAGIC, .driver_name = "rfcomm", #ifdef CONFIG_DEVFS_FS - .name = "bluetooth/rfcomm/%d", + .name = "bluetooth/rfcomm/", #else .name = "rfcomm", #endif diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c index 837c6652fac2..e8ba645fc366 100644 --- a/net/irda/ircomm/ircomm_tty.c +++ b/net/irda/ircomm/ircomm_tty.c @@ -99,11 +99,7 @@ int __init ircomm_tty_init(void) memset(&driver, 0, sizeof(struct tty_driver)); driver.magic = TTY_DRIVER_MAGIC; driver.driver_name = "ircomm"; -#ifdef CONFIG_DEVFS_FS - driver.name = "ircomm%d"; -#else driver.name = "ircomm"; -#endif driver.major = IRCOMM_TTY_MAJOR; driver.minor_start = IRCOMM_TTY_MINOR; driver.num = IRCOMM_TTY_PORTS; |