diff options
| author | Jiri Slaby (SUSE) <jirislaby@kernel.org> | 2023-04-20 11:35:59 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-04-20 13:48:50 +0200 |
| commit | f91cf1a30255d81cf1d8992974ec0a9c0fd4a771 (patch) | |
| tree | 06f5860171c07f5849e23c10373b74885f00766f /drivers/tty | |
| parent | 921234d78339b9ee67c2da4dc78aa6ecd47d76e1 (diff) | |
| download | lwn-f91cf1a30255d81cf1d8992974ec0a9c0fd4a771.tar.gz lwn-f91cf1a30255d81cf1d8992974ec0a9c0fd4a771.zip | |
tty: vt: drop checks for undefined VT_SINGLE_DRIVER
VT_SINGLE_DRIVER is defined nowhere. Remove its checks. These were added
long time ago and never used.
Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20230420093559.13200-4-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/vt/vt.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index 8582ec0b1499..5c5ca74c03af 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c @@ -137,9 +137,7 @@ const struct consw *conswitchp; struct vc vc_cons [MAX_NR_CONSOLES]; EXPORT_SYMBOL(vc_cons); -#ifndef VT_SINGLE_DRIVER static const struct consw *con_driver_map[MAX_NR_CONSOLES]; -#endif static int con_open(struct tty_struct *, struct file *); static void vc_init(struct vc_data *vc, unsigned int rows, @@ -1008,10 +1006,10 @@ static void visual_init(struct vc_data *vc, int num, int init) if (vc->vc_sw) module_put(vc->vc_sw->owner); vc->vc_sw = conswitchp; -#ifndef VT_SINGLE_DRIVER + if (con_driver_map[num]) vc->vc_sw = con_driver_map[num]; -#endif + __module_get(vc->vc_sw->owner); vc->vc_num = num; vc->vc_display_fg = &master_display_fg; @@ -3575,8 +3573,6 @@ int __init vty_init(const struct file_operations *console_fops) return 0; } -#ifndef VT_SINGLE_DRIVER - static struct class *vtconsole_class; static int do_bind_con_driver(const struct consw *csw, int first, int last, @@ -4278,8 +4274,6 @@ static int __init vtconsole_class_init(void) } postcore_initcall(vtconsole_class_init); -#endif - /* * Screen blanking */ |