aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/vt.c
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2006-09-29 04:59:47 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-29 12:18:10 -0400
commitd09d7ddf3018b4c6efa76dce72f6dec6054fa22b (patch)
tree09e28b0602f482b2fadcaecf353ffc02134485cd /drivers/char/vt.c
parent2aae4a108dab8b8bc92270335f6e4b5c146b32ae (diff)
[PATCH] There is no devfs, there has never been a devfs, we have always been at war with...
Jon Smirl noted a couple of tty driver functions now are quite misleadingly named with the death of devfs. A quick grep found another case in the lp driver. Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/vt.c')
-rw-r--r--drivers/char/vt.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index da7e66a2a38b..d7d880f8147b 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -128,8 +128,8 @@ const struct consw *conswitchp;
128#define DEFAULT_BELL_PITCH 750 128#define DEFAULT_BELL_PITCH 750
129#define DEFAULT_BELL_DURATION (HZ/8) 129#define DEFAULT_BELL_DURATION (HZ/8)
130 130
131extern void vcs_make_devfs(struct tty_struct *tty); 131extern void vcs_make_sysfs(struct tty_struct *tty);
132extern void vcs_remove_devfs(struct tty_struct *tty); 132extern void vcs_remove_sysfs(struct tty_struct *tty);
133 133
134extern void console_map_init(void); 134extern void console_map_init(void);
135#ifdef CONFIG_PROM_CONSOLE 135#ifdef CONFIG_PROM_CONSOLE
@@ -2498,7 +2498,7 @@ static int con_open(struct tty_struct *tty, struct file *filp)
2498 tty->winsize.ws_col = vc_cons[currcons].d->vc_cols; 2498 tty->winsize.ws_col = vc_cons[currcons].d->vc_cols;
2499 } 2499 }
2500 release_console_sem(); 2500 release_console_sem();
2501 vcs_make_devfs(tty); 2501 vcs_make_sysfs(tty);
2502 return ret; 2502 return ret;
2503 } 2503 }
2504 } 2504 }
@@ -2511,7 +2511,7 @@ static int con_open(struct tty_struct *tty, struct file *filp)
2511 * and taking a ref against the tty while we're in the process of forgetting 2511 * and taking a ref against the tty while we're in the process of forgetting
2512 * about it and cleaning things up. 2512 * about it and cleaning things up.
2513 * 2513 *
2514 * This is because vcs_remove_devfs() can sleep and will drop the BKL. 2514 * This is because vcs_remove_sysfs() can sleep and will drop the BKL.
2515 */ 2515 */
2516static void con_close(struct tty_struct *tty, struct file *filp) 2516static void con_close(struct tty_struct *tty, struct file *filp)
2517{ 2517{
@@ -2524,7 +2524,7 @@ static void con_close(struct tty_struct *tty, struct file *filp)
2524 vc->vc_tty = NULL; 2524 vc->vc_tty = NULL;
2525 tty->driver_data = NULL; 2525 tty->driver_data = NULL;
2526 release_console_sem(); 2526 release_console_sem();
2527 vcs_remove_devfs(tty); 2527 vcs_remove_sysfs(tty);
2528 mutex_unlock(&tty_mutex); 2528 mutex_unlock(&tty_mutex);
2529 /* 2529 /*
2530 * tty_mutex is released, but we still hold BKL, so there is 2530 * tty_mutex is released, but we still hold BKL, so there is