Commit 2cd0050c authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman

TTY: move tty_lookup_driver to switch-cases

The labels express more the nature of the decision tree. We returned
from each if with a driver. Now we do this at the end of the function
and the code flow is clear.

While at it, remove an obsolete comment (we already take the
reference).
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ba5db448
...@@ -1841,16 +1841,17 @@ static struct tty_driver *tty_lookup_driver(dev_t device, struct file *filp, ...@@ -1841,16 +1841,17 @@ static struct tty_driver *tty_lookup_driver(dev_t device, struct file *filp,
{ {
struct tty_driver *driver; struct tty_driver *driver;
switch (device) {
#ifdef CONFIG_VT #ifdef CONFIG_VT
if (device == MKDEV(TTY_MAJOR, 0)) { case MKDEV(TTY_MAJOR, 0): {
extern struct tty_driver *console_driver; extern struct tty_driver *console_driver;
driver = tty_driver_kref_get(console_driver); driver = tty_driver_kref_get(console_driver);
*index = fg_console; *index = fg_console;
*noctty = 1; *noctty = 1;
return driver; break;
} }
#endif #endif
if (device == MKDEV(TTYAUX_MAJOR, 1)) { case MKDEV(TTYAUX_MAJOR, 1): {
struct tty_driver *console_driver = console_device(index); struct tty_driver *console_driver = console_device(index);
if (console_driver) { if (console_driver) {
driver = tty_driver_kref_get(console_driver); driver = tty_driver_kref_get(console_driver);
...@@ -1858,15 +1859,17 @@ static struct tty_driver *tty_lookup_driver(dev_t device, struct file *filp, ...@@ -1858,15 +1859,17 @@ static struct tty_driver *tty_lookup_driver(dev_t device, struct file *filp,
/* Don't let /dev/console block */ /* Don't let /dev/console block */
filp->f_flags |= O_NONBLOCK; filp->f_flags |= O_NONBLOCK;
*noctty = 1; *noctty = 1;
return driver; break;
} }
} }
return ERR_PTR(-ENODEV); return ERR_PTR(-ENODEV);
} }
default:
driver = get_tty_driver(device, index); driver = get_tty_driver(device, index);
if (!driver) if (!driver)
return ERR_PTR(-ENODEV); return ERR_PTR(-ENODEV);
break;
}
return driver; return driver;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment