aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/tty_io.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/tty_io.c')
-rw-r--r--drivers/char/tty_io.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index ebe1158e6c6e..6c79ff3030fa 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -2963,8 +2963,8 @@ static struct class *tty_class;
2963 * Returns a pointer to the class device (or ERR_PTR(-EFOO) on error). 2963 * Returns a pointer to the class device (or ERR_PTR(-EFOO) on error).
2964 * 2964 *
2965 * This call is required to be made to register an individual tty device if 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 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. 2967 * bit is not set, this function should not be called by a tty driver.
2968 */ 2968 */
2969struct class_device *tty_register_device(struct tty_driver *driver, 2969struct class_device *tty_register_device(struct tty_driver *driver,
2970 unsigned index, struct device *device) 2970 unsigned index, struct device *device)
@@ -3117,7 +3117,7 @@ int tty_register_driver(struct tty_driver *driver)
3117 3117
3118 list_add(&driver->tty_drivers, &tty_drivers); 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 for(i = 0; i < driver->num; i++) 3121 for(i = 0; i < driver->num; i++)
3122 tty_register_device(driver, i, NULL); 3122 tty_register_device(driver, i, NULL);
3123 } 3123 }
@@ -3160,7 +3160,7 @@ int tty_unregister_driver(struct tty_driver *driver)
3160 driver->termios_locked[i] = NULL; 3160 driver->termios_locked[i] = NULL;
3161 kfree(tp); 3161 kfree(tp);
3162 } 3162 }
3163 if (!(driver->flags & TTY_DRIVER_NO_DEVFS)) 3163 if (!(driver->flags & TTY_DRIVER_DYNAMIC_DEV))
3164 tty_unregister_device(driver, i); 3164 tty_unregister_device(driver, i);
3165 } 3165 }
3166 p = driver->ttys; 3166 p = driver->ttys;