Commit e994ddf6 authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds

[PATCH] Kill useless pm_access from vt.c

pm_access does nothing these days, and looks ugly.  This removes it from
vt.c.  That actually looks like last user in the tree; it should be
possible to kill pm_access completely after 2.6.10.  Ouch and add warning
to obsolete pm.txt file.
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f912d92c
...@@ -36,8 +36,8 @@ system the associated daemon will exit gracefully. ...@@ -36,8 +36,8 @@ system the associated daemon will exit gracefully.
apmd: http://worldvisions.ca/~apenwarr/apmd/ apmd: http://worldvisions.ca/~apenwarr/apmd/
acpid: http://acpid.sf.net/ acpid: http://acpid.sf.net/
Driver Interface Driver Interface -- OBSOLETE, DO NOT USE!
---------------- ----------------*************************
If you are writing a new driver or maintaining an old driver, it If you are writing a new driver or maintaining an old driver, it
should include power management support. Without power management should include power management support. Without power management
support, a single driver may prevent a system with power management support, a single driver may prevent a system with power management
...@@ -262,8 +262,8 @@ Q: Who do I contact for additional information about ...@@ -262,8 +262,8 @@ Q: Who do I contact for additional information about
ACPI Development mailing list: acpi-devel@lists.sourceforge.net ACPI Development mailing list: acpi-devel@lists.sourceforge.net
System Interface System Interface -- OBSOLETE, DO NOT USE!
---------------- ----------------*************************
If you are providing new power management support to Linux (ie. If you are providing new power management support to Linux (ie.
adding support for something like APM or ACPI), you should adding support for something like APM or ACPI), you should
communicate with drivers through the existing generic power communicate with drivers through the existing generic power
......
...@@ -2153,8 +2153,6 @@ void vt_console_print(struct console *co, const char *b, unsigned count) ...@@ -2153,8 +2153,6 @@ void vt_console_print(struct console *co, const char *b, unsigned count)
if (!printable || test_and_set_bit(0, &printing)) if (!printable || test_and_set_bit(0, &printing))
return; return;
pm_access(pm_con);
if (kmsg_redirect && vc_cons_allocated(kmsg_redirect - 1)) if (kmsg_redirect && vc_cons_allocated(kmsg_redirect - 1))
currcons = kmsg_redirect - 1; currcons = kmsg_redirect - 1;
...@@ -2353,7 +2351,6 @@ static int con_write(struct tty_struct *tty, const unsigned char *buf, int count ...@@ -2353,7 +2351,6 @@ static int con_write(struct tty_struct *tty, const unsigned char *buf, int count
{ {
int retval; int retval;
pm_access(pm_con);
retval = do_con_write(tty, buf, count); retval = do_con_write(tty, buf, count);
con_flush_chars(tty); con_flush_chars(tty);
...@@ -2364,7 +2361,6 @@ static void con_put_char(struct tty_struct *tty, unsigned char ch) ...@@ -2364,7 +2361,6 @@ static void con_put_char(struct tty_struct *tty, unsigned char ch)
{ {
if (in_interrupt()) if (in_interrupt())
return; /* n_r3964 calls put_char() from interrupt context */ return; /* n_r3964 calls put_char() from interrupt context */
pm_access(pm_con);
do_con_write(tty, &ch, 1); do_con_write(tty, &ch, 1);
} }
...@@ -2433,8 +2429,6 @@ static void con_flush_chars(struct tty_struct *tty) ...@@ -2433,8 +2429,6 @@ static void con_flush_chars(struct tty_struct *tty)
if (in_interrupt()) /* from flush_to_ldisc */ if (in_interrupt()) /* from flush_to_ldisc */
return; return;
pm_access(pm_con);
/* if we race with con_close(), vt may be null */ /* if we race with con_close(), vt may be null */
acquire_console_sem(); acquire_console_sem();
vt = tty->driver_data; vt = tty->driver_data;
......
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