aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2005-06-21 00:15:16 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2006-06-26 15:25:09 -0400
commit331b831983f9d706f4a40d08a996d5c2c7a6ea7b (patch)
tree9d47d5f8d6f882d26c8deade0e44442cebf2e288 /drivers
parentf4eaa37017a5a68f67ef86729508022c13fb8e6d (diff)
[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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/ip2/ip2main.c2
-rw-r--r--drivers/char/pty.c4
-rw-r--r--drivers/char/rocket.c4
-rw-r--r--drivers/char/tty_io.c8
-rw-r--r--drivers/isdn/gigaset/interface.c2
-rw-r--r--drivers/isdn/i4l/isdn_tty.c2
-rw-r--r--drivers/s390/char/tty3270.c2
-rw-r--r--drivers/serial/crisv10.c2
-rw-r--r--drivers/serial/serial_core.c2
-rw-r--r--drivers/tc/zs.c2
-rw-r--r--drivers/usb/class/cdc-acm.c2
-rw-r--r--drivers/usb/gadget/serial.c2
-rw-r--r--drivers/usb/serial/usb-serial.c2
13 files changed, 18 insertions, 18 deletions
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c
index 2db55d1f0403..8619542766cb 100644
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/char/ip2/ip2main.c
@@ -678,7 +678,7 @@ ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize)
678 ip2_tty_driver->subtype = SERIAL_TYPE_NORMAL; 678 ip2_tty_driver->subtype = SERIAL_TYPE_NORMAL;
679 ip2_tty_driver->init_termios = tty_std_termios; 679 ip2_tty_driver->init_termios = tty_std_termios;
680 ip2_tty_driver->init_termios.c_cflag = B9600|CS8|CREAD|HUPCL|CLOCAL; 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 tty_set_operations(ip2_tty_driver, &ip2_ops); 682 tty_set_operations(ip2_tty_driver, &ip2_ops);
683 683
684 ip2trace (ITRC_NO_PORT, ITRC_INIT, 3, 0 ); 684 ip2trace (ITRC_NO_PORT, ITRC_INIT, 3, 0 );
diff --git a/drivers/char/pty.c b/drivers/char/pty.c
index d3a5092402c2..f373d0155a77 100644
--- a/drivers/char/pty.c
+++ b/drivers/char/pty.c
@@ -368,7 +368,7 @@ static void __init unix98_pty_init(void)
368 ptm_driver->init_termios.c_cflag = B38400 | CS8 | CREAD; 368 ptm_driver->init_termios.c_cflag = B38400 | CS8 | CREAD;
369 ptm_driver->init_termios.c_lflag = 0; 369 ptm_driver->init_termios.c_lflag = 0;
370 ptm_driver->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW | 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 ptm_driver->other = pts_driver; 372 ptm_driver->other = pts_driver;
373 tty_set_operations(ptm_driver, &pty_ops); 373 tty_set_operations(ptm_driver, &pty_ops);
374 ptm_driver->ioctl = pty_unix98_ioctl; 374 ptm_driver->ioctl = pty_unix98_ioctl;
@@ -383,7 +383,7 @@ static void __init unix98_pty_init(void)
383 pts_driver->init_termios = tty_std_termios; 383 pts_driver->init_termios = tty_std_termios;
384 pts_driver->init_termios.c_cflag = B38400 | CS8 | CREAD; 384 pts_driver->init_termios.c_cflag = B38400 | CS8 | CREAD;
385 pts_driver->flags = TTY_DRIVER_RESET_TERMIOS | TTY_DRIVER_REAL_RAW | 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 pts_driver->other = ptm_driver; 387 pts_driver->other = ptm_driver;
388 tty_set_operations(pts_driver, &pty_ops); 388 tty_set_operations(pts_driver, &pty_ops);
389 389
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index ed511ec9b578..0ac131881322 100644
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -2426,7 +2426,7 @@ static int __init rp_init(void)
2426 */ 2426 */
2427 2427
2428 rocket_driver->owner = THIS_MODULE; 2428 rocket_driver->owner = THIS_MODULE;
2429 rocket_driver->flags = TTY_DRIVER_NO_DEVFS; 2429 rocket_driver->flags = TTY_DRIVER_DYNAMIC_DEV;
2430 rocket_driver->name = "ttyR"; 2430 rocket_driver->name = "ttyR";
2431 rocket_driver->driver_name = "Comtrol RocketPort"; 2431 rocket_driver->driver_name = "Comtrol RocketPort";
2432 rocket_driver->major = TTY_ROCKET_MAJOR; 2432 rocket_driver->major = TTY_ROCKET_MAJOR;
@@ -2437,7 +2437,7 @@ static int __init rp_init(void)
2437 rocket_driver->init_termios.c_cflag = 2437 rocket_driver->init_termios.c_cflag =
2438 B9600 | CS8 | CREAD | HUPCL | CLOCAL; 2438 B9600 | CS8 | CREAD | HUPCL | CLOCAL;
2439#ifdef ROCKET_SOFT_FLOW 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#endif 2441#endif
2442 tty_set_operations(rocket_driver, &rocket_ops); 2442 tty_set_operations(rocket_driver, &rocket_ops);
2443 2443
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;
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
index 9f8628bbdf56..bd2e4267528e 100644
--- a/drivers/isdn/gigaset/interface.c
+++ b/drivers/isdn/gigaset/interface.c
@@ -691,7 +691,7 @@ void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
691 tty->major = GIG_MAJOR, 691 tty->major = GIG_MAJOR,
692 tty->type = TTY_DRIVER_TYPE_SERIAL, 692 tty->type = TTY_DRIVER_TYPE_SERIAL,
693 tty->subtype = SERIAL_TYPE_NORMAL, 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 tty->driver_name = procname; 696 tty->driver_name = procname;
697 tty->name = devname; 697 tty->name = devname;
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index e7f0f15c7353..77579f82aede 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -1896,7 +1896,7 @@ isdn_tty_modem_init(void)
1896 m->tty_modem->subtype = SERIAL_TYPE_NORMAL; 1896 m->tty_modem->subtype = SERIAL_TYPE_NORMAL;
1897 m->tty_modem->init_termios = tty_std_termios; 1897 m->tty_modem->init_termios = tty_std_termios;
1898 m->tty_modem->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; 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 m->tty_modem->driver_name = "isdn_tty"; 1900 m->tty_modem->driver_name = "isdn_tty";
1901 tty_set_operations(m->tty_modem, &modem_ops); 1901 tty_set_operations(m->tty_modem, &modem_ops);
1902 retval = tty_register_driver(m->tty_modem); 1902 retval = tty_register_driver(m->tty_modem);
diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c
index 43c8c9f5f301..7d26a3e4cb80 100644
--- a/drivers/s390/char/tty3270.c
+++ b/drivers/s390/char/tty3270.c
@@ -1792,7 +1792,7 @@ tty3270_init(void)
1792 driver->type = TTY_DRIVER_TYPE_SYSTEM; 1792 driver->type = TTY_DRIVER_TYPE_SYSTEM;
1793 driver->subtype = SYSTEM_TYPE_TTY; 1793 driver->subtype = SYSTEM_TYPE_TTY;
1794 driver->init_termios = tty_std_termios; 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 tty_set_operations(driver, &tty3270_ops); 1796 tty_set_operations(driver, &tty3270_ops);
1797 ret = tty_register_driver(driver); 1797 ret = tty_register_driver(driver);
1798 if (ret) { 1798 if (ret) {
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
index 89700141f87e..2364c3949981 100644
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -4884,7 +4884,7 @@ rs_init(void)
4884 driver->init_termios = tty_std_termios; 4884 driver->init_termios = tty_std_termios;
4885 driver->init_termios.c_cflag = 4885 driver->init_termios.c_cflag =
4886 B115200 | CS8 | CREAD | HUPCL | CLOCAL; /* is normally B9600 default... */ 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 driver->termios = serial_termios; 4888 driver->termios = serial_termios;
4889 driver->termios_locked = serial_termios_locked; 4889 driver->termios_locked = serial_termios_locked;
4890 4890
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 84d70d855598..7dc1e67b6851 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -2160,7 +2160,7 @@ int uart_register_driver(struct uart_driver *drv)
2160 normal->subtype = SERIAL_TYPE_NORMAL; 2160 normal->subtype = SERIAL_TYPE_NORMAL;
2161 normal->init_termios = tty_std_termios; 2161 normal->init_termios = tty_std_termios;
2162 normal->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; 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 normal->driver_state = drv; 2164 normal->driver_state = drv;
2165 tty_set_operations(normal, &uart_ops); 2165 tty_set_operations(normal, &uart_ops);
2166 2166
diff --git a/drivers/tc/zs.c b/drivers/tc/zs.c
index 582d926cd000..7f27b356eaf7 100644
--- a/drivers/tc/zs.c
+++ b/drivers/tc/zs.c
@@ -1753,7 +1753,7 @@ int __init zs_init(void)
1753 serial_driver->init_termios = tty_std_termios; 1753 serial_driver->init_termios = tty_std_termios;
1754 serial_driver->init_termios.c_cflag = 1754 serial_driver->init_termios.c_cflag =
1755 B9600 | CS8 | CREAD | HUPCL | CLOCAL; 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 tty_set_operations(serial_driver, &serial_ops); 1757 tty_set_operations(serial_driver, &serial_ops);
1758 1758
1759 if (tty_register_driver(serial_driver)) 1759 if (tty_register_driver(serial_driver))
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index a0b9eddd98e4..3670d77e912c 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1149,7 +1149,7 @@ static int __init acm_init(void)
1149 acm_tty_driver->minor_start = 0, 1149 acm_tty_driver->minor_start = 0,
1150 acm_tty_driver->type = TTY_DRIVER_TYPE_SERIAL, 1150 acm_tty_driver->type = TTY_DRIVER_TYPE_SERIAL,
1151 acm_tty_driver->subtype = SERIAL_TYPE_NORMAL, 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 acm_tty_driver->init_termios = tty_std_termios; 1153 acm_tty_driver->init_termios = tty_std_termios;
1154 acm_tty_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; 1154 acm_tty_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;
1155 tty_set_operations(acm_tty_driver, &acm_ops); 1155 tty_set_operations(acm_tty_driver, &acm_ops);
diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c
index 2c8e5c10eb9f..416acac879df 100644
--- a/drivers/usb/gadget/serial.c
+++ b/drivers/usb/gadget/serial.c
@@ -592,7 +592,7 @@ static int __init gs_module_init(void)
592 gs_tty_driver->minor_start = GS_MINOR_START; 592 gs_tty_driver->minor_start = GS_MINOR_START;
593 gs_tty_driver->type = TTY_DRIVER_TYPE_SERIAL; 593 gs_tty_driver->type = TTY_DRIVER_TYPE_SERIAL;
594 gs_tty_driver->subtype = SERIAL_TYPE_NORMAL; 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 gs_tty_driver->init_termios = tty_std_termios; 596 gs_tty_driver->init_termios = tty_std_termios;
597 gs_tty_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; 597 gs_tty_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;
598 tty_set_operations(gs_tty_driver, &gs_tty_ops); 598 tty_set_operations(gs_tty_driver, &gs_tty_ops);
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index db7f54b0d856..f466f89eeb6d 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -1064,7 +1064,7 @@ static int __init usb_serial_init(void)
1064 usb_serial_tty_driver->minor_start = 0; 1064 usb_serial_tty_driver->minor_start = 0;
1065 usb_serial_tty_driver->type = TTY_DRIVER_TYPE_SERIAL; 1065 usb_serial_tty_driver->type = TTY_DRIVER_TYPE_SERIAL;
1066 usb_serial_tty_driver->subtype = SERIAL_TYPE_NORMAL; 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 usb_serial_tty_driver->init_termios = tty_std_termios; 1068 usb_serial_tty_driver->init_termios = tty_std_termios;
1069 usb_serial_tty_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; 1069 usb_serial_tty_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;
1070 tty_set_operations(usb_serial_tty_driver, &serial_ops); 1070 tty_set_operations(usb_serial_tty_driver, &serial_ops);