Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] devfs: Rename TTY_DRIVER_NO_DEVFS to TTY_DRIVER_DYNAMIC_DEV

I've always found this flag confusing. Now that devfs is no longer around, it
has been renamed, and the documentation for when this flag should be used has
been updated.

Also fixes all drivers that use this flag.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

+32 -25
+1 -1
arch/cris/arch-v10/kernel/debugport.c
··· 541 541 dummy_driver.init_termios = tty_std_termios; 542 542 dummy_driver.init_termios.c_cflag = 543 543 B115200 | CS8 | CREAD | HUPCL | CLOCAL; /* is normally B9600 default... */ 544 - dummy_driver.flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS; 544 + dummy_driver.flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; 545 545 546 546 dummy_driver.open = dummy_open; 547 547 dummy_driver.close = dummy_close;
+1 -1
arch/cris/arch-v32/kernel/debugport.c
··· 353 353 dummy_driver.init_termios = tty_std_termios; 354 354 dummy_driver.init_termios.c_cflag = 355 355 B115200 | CS8 | CREAD | HUPCL | CLOCAL; /* is normally B9600 default... */ 356 - dummy_driver.flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS; 356 + dummy_driver.flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; 357 357 358 358 dummy_driver.open = dummy_open; 359 359 dummy_driver.close = dummy_close;
+1 -1
arch/ppc/4xx_io/serial_sicc.c
··· 1758 1758 siccnormal_driver->subtype = SERIAL_TYPE_NORMAL; 1759 1759 siccnormal_driver->init_termios = tty_std_termios; 1760 1760 siccnormal_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; 1761 - siccnormal_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS; 1761 + siccnormal_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; 1762 1762 tty_set_operations(siccnormal_driver, &sicc_ops); 1763 1763 1764 1764 if (tty_register_driver(siccnormal_driver))
+1 -1
drivers/char/ip2/ip2main.c
··· 678 678 ip2_tty_driver->subtype = SERIAL_TYPE_NORMAL; 679 679 ip2_tty_driver->init_termios = tty_std_termios; 680 680 ip2_tty_driver->init_termios.c_cflag = B9600|CS8|CREAD|HUPCL|CLOCAL; 681 - ip2_tty_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS; 681 + ip2_tty_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; 682 682 tty_set_operations(ip2_tty_driver, &ip2_ops); 683 683 684 684 ip2trace (ITRC_NO_PORT, ITRC_INIT, 3, 0 );
+2 -2
drivers/char/pty.c
··· 368 368 ptm_driver->init_termios.c_cflag = B38400 | CS8 | CREAD; 369 369 ptm_driver->init_termios.c_lflag = 0; 370 370 ptm_driver->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW | 371 - TTY_DRIVER_NO_DEVFS | TTY_DRIVER_DEVPTS_MEM; 371 + TTY_DRIVER_DYNAMIC_DEV | TTY_DRIVER_DEVPTS_MEM; 372 372 ptm_driver->other = pts_driver; 373 373 tty_set_operations(ptm_driver, &pty_ops); 374 374 ptm_driver->ioctl = pty_unix98_ioctl; ··· 383 383 pts_driver->init_termios = tty_std_termios; 384 384 pts_driver->init_termios.c_cflag = B38400 | CS8 | CREAD; 385 385 pts_driver->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW | 386 - TTY_DRIVER_NO_DEVFS | TTY_DRIVER_DEVPTS_MEM; 386 + TTY_DRIVER_DYNAMIC_DEV | TTY_DRIVER_DEVPTS_MEM; 387 387 pts_driver->other = ptm_driver; 388 388 tty_set_operations(pts_driver, &pty_ops); 389 389
+2 -2
drivers/char/rocket.c
··· 2426 2426 */ 2427 2427 2428 2428 rocket_driver->owner = THIS_MODULE; 2429 - rocket_driver->flags = TTY_DRIVER_NO_DEVFS; 2429 + rocket_driver->flags = TTY_DRIVER_DYNAMIC_DEV; 2430 2430 rocket_driver->name = "ttyR"; 2431 2431 rocket_driver->driver_name = "Comtrol RocketPort"; 2432 2432 rocket_driver->major = TTY_ROCKET_MAJOR; ··· 2437 2437 rocket_driver->init_termios.c_cflag = 2438 2438 B9600 | CS8 | CREAD | HUPCL | CLOCAL; 2439 2439 #ifdef ROCKET_SOFT_FLOW 2440 - rocket_driver->flags |= TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS; 2440 + rocket_driver->flags |= TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; 2441 2441 #endif 2442 2442 tty_set_operations(rocket_driver, &rocket_ops); 2443 2443
+4 -4
drivers/char/tty_io.c
··· 2963 2963 * Returns a pointer to the class device (or ERR_PTR(-EFOO) on error). 2964 2964 * 2965 2965 * This call is required to be made to register an individual tty device if 2966 - * the tty driver's flags have the TTY_DRIVER_NO_DEVFS bit set. If that 2967 - * bit is not set, this function should not be called. 2966 + * the tty driver's flags have the TTY_DRIVER_DYNAMIC_DEV bit set. If that 2967 + * bit is not set, this function should not be called by a tty driver. 2968 2968 */ 2969 2969 struct class_device *tty_register_device(struct tty_driver *driver, 2970 2970 unsigned index, struct device *device) ··· 3117 3117 3118 3118 list_add(&driver->tty_drivers, &tty_drivers); 3119 3119 3120 - if ( !(driver->flags & TTY_DRIVER_NO_DEVFS) ) { 3120 + if ( !(driver->flags & TTY_DRIVER_DYNAMIC_DEV) ) { 3121 3121 for(i = 0; i < driver->num; i++) 3122 3122 tty_register_device(driver, i, NULL); 3123 3123 } ··· 3160 3160 driver->termios_locked[i] = NULL; 3161 3161 kfree(tp); 3162 3162 } 3163 - if (!(driver->flags & TTY_DRIVER_NO_DEVFS)) 3163 + if (!(driver->flags & TTY_DRIVER_DYNAMIC_DEV)) 3164 3164 tty_unregister_device(driver, i); 3165 3165 } 3166 3166 p = driver->ttys;
+1 -1
drivers/isdn/gigaset/interface.c
··· 691 691 tty->major = GIG_MAJOR, 692 692 tty->type = TTY_DRIVER_TYPE_SERIAL, 693 693 tty->subtype = SERIAL_TYPE_NORMAL, 694 - tty->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS, 694 + tty->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; 695 695 696 696 tty->driver_name = procname; 697 697 tty->name = devname;
+1 -1
drivers/isdn/i4l/isdn_tty.c
··· 1896 1896 m->tty_modem->subtype = SERIAL_TYPE_NORMAL; 1897 1897 m->tty_modem->init_termios = tty_std_termios; 1898 1898 m->tty_modem->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; 1899 - m->tty_modem->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS; 1899 + m->tty_modem->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; 1900 1900 m->tty_modem->driver_name = "isdn_tty"; 1901 1901 tty_set_operations(m->tty_modem, &modem_ops); 1902 1902 retval = tty_register_driver(m->tty_modem);
+1 -1
drivers/s390/char/tty3270.c
··· 1792 1792 driver->type = TTY_DRIVER_TYPE_SYSTEM; 1793 1793 driver->subtype = SYSTEM_TYPE_TTY; 1794 1794 driver->init_termios = tty_std_termios; 1795 - driver->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_NO_DEVFS; 1795 + driver->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_DYNAMIC_DEV; 1796 1796 tty_set_operations(driver, &tty3270_ops); 1797 1797 ret = tty_register_driver(driver); 1798 1798 if (ret) {
+1 -1
drivers/serial/crisv10.c
··· 4884 4884 driver->init_termios = tty_std_termios; 4885 4885 driver->init_termios.c_cflag = 4886 4886 B115200 | CS8 | CREAD | HUPCL | CLOCAL; /* is normally B9600 default... */ 4887 - driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS; 4887 + driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; 4888 4888 driver->termios = serial_termios; 4889 4889 driver->termios_locked = serial_termios_locked; 4890 4890
+1 -1
drivers/serial/serial_core.c
··· 2160 2160 normal->subtype = SERIAL_TYPE_NORMAL; 2161 2161 normal->init_termios = tty_std_termios; 2162 2162 normal->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; 2163 - normal->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS; 2163 + normal->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; 2164 2164 normal->driver_state = drv; 2165 2165 tty_set_operations(normal, &uart_ops); 2166 2166
+1 -1
drivers/tc/zs.c
··· 1753 1753 serial_driver->init_termios = tty_std_termios; 1754 1754 serial_driver->init_termios.c_cflag = 1755 1755 B9600 | CS8 | CREAD | HUPCL | CLOCAL; 1756 - serial_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS; 1756 + serial_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; 1757 1757 tty_set_operations(serial_driver, &serial_ops); 1758 1758 1759 1759 if (tty_register_driver(serial_driver))
+1 -1
drivers/usb/class/cdc-acm.c
··· 1149 1149 acm_tty_driver->minor_start = 0, 1150 1150 acm_tty_driver->type = TTY_DRIVER_TYPE_SERIAL, 1151 1151 acm_tty_driver->subtype = SERIAL_TYPE_NORMAL, 1152 - acm_tty_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS, 1152 + acm_tty_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; 1153 1153 acm_tty_driver->init_termios = tty_std_termios; 1154 1154 acm_tty_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; 1155 1155 tty_set_operations(acm_tty_driver, &acm_ops);
+1 -1
drivers/usb/gadget/serial.c
··· 592 592 gs_tty_driver->minor_start = GS_MINOR_START; 593 593 gs_tty_driver->type = TTY_DRIVER_TYPE_SERIAL; 594 594 gs_tty_driver->subtype = SERIAL_TYPE_NORMAL; 595 - gs_tty_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS; 595 + gs_tty_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; 596 596 gs_tty_driver->init_termios = tty_std_termios; 597 597 gs_tty_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; 598 598 tty_set_operations(gs_tty_driver, &gs_tty_ops);
+1 -1
drivers/usb/serial/usb-serial.c
··· 1064 1064 usb_serial_tty_driver->minor_start = 0; 1065 1065 usb_serial_tty_driver->type = TTY_DRIVER_TYPE_SERIAL; 1066 1066 usb_serial_tty_driver->subtype = SERIAL_TYPE_NORMAL; 1067 - usb_serial_tty_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS; 1067 + usb_serial_tty_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; 1068 1068 usb_serial_tty_driver->init_termios = tty_std_termios; 1069 1069 usb_serial_tty_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; 1070 1070 tty_set_operations(usb_serial_tty_driver, &serial_ops);
+10 -3
include/linux/tty_driver.h
··· 241 241 * is also a promise, if the above case is true, not to signal 242 242 * overruns, either.) 243 243 * 244 - * TTY_DRIVER_NO_DEVFS --- if set, do not create devfs entries. This 245 - * is only used by tty_register_driver(). 244 + * TTY_DRIVER_DYNAMIC_DEV --- if set, the individual tty devices need 245 + * to be registered with a call to tty_register_driver() when the 246 + * device is found in the system and unregistered with a call to 247 + * tty_unregister_device() so the devices will be show up 248 + * properly in sysfs. If not set, driver->num entries will be 249 + * created by the tty core in sysfs when tty_register_driver() is 250 + * called. This is to be used by drivers that have tty devices 251 + * that can appear and disappear while the main tty driver is 252 + * registered with the tty core. 246 253 * 247 254 * TTY_DRIVER_DEVPTS_MEM -- don't use the standard arrays, instead 248 255 * use dynamic memory keyed through the devpts filesystem. This ··· 258 251 #define TTY_DRIVER_INSTALLED 0x0001 259 252 #define TTY_DRIVER_RESET_TERMIOS 0x0002 260 253 #define TTY_DRIVER_REAL_RAW 0x0004 261 - #define TTY_DRIVER_NO_DEVFS 0x0008 254 + #define TTY_DRIVER_DYNAMIC_DEV 0x0008 262 255 #define TTY_DRIVER_DEVPTS_MEM 0x0010 263 256 264 257 /* tty driver types */
+1 -1
net/bluetooth/rfcomm/tty.c
··· 1030 1030 rfcomm_tty_driver->minor_start = RFCOMM_TTY_MINOR; 1031 1031 rfcomm_tty_driver->type = TTY_DRIVER_TYPE_SERIAL; 1032 1032 rfcomm_tty_driver->subtype = SERIAL_TYPE_NORMAL; 1033 - rfcomm_tty_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_NO_DEVFS; 1033 + rfcomm_tty_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; 1034 1034 rfcomm_tty_driver->init_termios = tty_std_termios; 1035 1035 rfcomm_tty_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; 1036 1036 tty_set_operations(rfcomm_tty_driver, &rfcomm_ops);