diff options
author | Milton Miller <miltonm@bga.com> | 2005-07-07 20:56:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 21:23:39 -0400 |
commit | 5f6d9c072df162a8601a09e6c63fd0e4f5aecd06 (patch) | |
tree | 6b8684f1449bc36f02397b4ca24b1b4a17cf2382 | |
parent | e51d8c90a5ead16810302b2dc5127724c9045e77 (diff) |
[PATCH] hvc_console: remove num_vterms and some dead code
num_vterms hasn't been used since the hotplug support went in. Also, remove a
dead code line from a list_for_each_entry conversion.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/char/hvc_console.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c index 31980994fead..fd7532504252 100644 --- a/drivers/char/hvc_console.c +++ b/drivers/char/hvc_console.c | |||
@@ -146,8 +146,6 @@ struct hvc_struct *hvc_get_by_index(int index) | |||
146 | */ | 146 | */ |
147 | static uint32_t vtermnos[MAX_NR_HVC_CONSOLES]; | 147 | static uint32_t vtermnos[MAX_NR_HVC_CONSOLES]; |
148 | 148 | ||
149 | /* Used for accounting purposes */ | ||
150 | static int num_vterms = 0; | ||
151 | 149 | ||
152 | /* | 150 | /* |
153 | * Console APIs, NOT TTY. These APIs are available immediately when | 151 | * Console APIs, NOT TTY. These APIs are available immediately when |
@@ -219,7 +217,7 @@ static int __init hvc_console_init(void) | |||
219 | 217 | ||
220 | for (i=0; i<MAX_NR_HVC_CONSOLES; i++) | 218 | for (i=0; i<MAX_NR_HVC_CONSOLES; i++) |
221 | vtermnos[i] = -1; | 219 | vtermnos[i] = -1; |
222 | num_vterms = hvc_find_vtys(); | 220 | hvc_find_vtys(); |
223 | register_console(&hvc_con_driver); | 221 | register_console(&hvc_con_driver); |
224 | return 0; | 222 | return 0; |
225 | } | 223 | } |
@@ -651,7 +649,6 @@ int khvcd(void *unused) | |||
651 | if (cpus_empty(cpus_in_xmon)) { | 649 | if (cpus_empty(cpus_in_xmon)) { |
652 | spin_lock(&hvc_structs_lock); | 650 | spin_lock(&hvc_structs_lock); |
653 | list_for_each_entry(hp, &hvc_structs, next) { | 651 | list_for_each_entry(hp, &hvc_structs, next) { |
654 | /*hp = list_entry(node, struct hvc_struct, * next); */ | ||
655 | poll_mask |= hvc_poll(hp); | 652 | poll_mask |= hvc_poll(hp); |
656 | } | 653 | } |
657 | spin_unlock(&hvc_structs_lock); | 654 | spin_unlock(&hvc_structs_lock); |
@@ -811,9 +808,8 @@ int __init hvc_init(void) | |||
811 | { | 808 | { |
812 | int rc; | 809 | int rc; |
813 | 810 | ||
814 | /* We need more than num_vterms adapters due to hotplug additions. */ | 811 | /* We need more than hvc_count adapters due to hotplug additions. */ |
815 | hvc_driver = alloc_tty_driver(HVC_ALLOC_TTY_ADAPTERS); | 812 | hvc_driver = alloc_tty_driver(HVC_ALLOC_TTY_ADAPTERS); |
816 | /* hvc_driver = alloc_tty_driver(num_vterms); */ | ||
817 | if (!hvc_driver) | 813 | if (!hvc_driver) |
818 | return -ENOMEM; | 814 | return -ENOMEM; |
819 | 815 | ||