[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>
This commit is contained in:
parent
e51d8c90a5
commit
5f6d9c072d
@ -146,8 +146,6 @@ struct hvc_struct *hvc_get_by_index(int index)
|
|||||||
*/
|
*/
|
||||||
static uint32_t vtermnos[MAX_NR_HVC_CONSOLES];
|
static uint32_t vtermnos[MAX_NR_HVC_CONSOLES];
|
||||||
|
|
||||||
/* Used for accounting purposes */
|
|
||||||
static int num_vterms = 0;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Console APIs, NOT TTY. These APIs are available immediately when
|
* Console APIs, NOT TTY. These APIs are available immediately when
|
||||||
@ -219,7 +217,7 @@ static int __init hvc_console_init(void)
|
|||||||
|
|
||||||
for (i=0; i<MAX_NR_HVC_CONSOLES; i++)
|
for (i=0; i<MAX_NR_HVC_CONSOLES; i++)
|
||||||
vtermnos[i] = -1;
|
vtermnos[i] = -1;
|
||||||
num_vterms = hvc_find_vtys();
|
hvc_find_vtys();
|
||||||
register_console(&hvc_con_driver);
|
register_console(&hvc_con_driver);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -651,7 +649,6 @@ int khvcd(void *unused)
|
|||||||
if (cpus_empty(cpus_in_xmon)) {
|
if (cpus_empty(cpus_in_xmon)) {
|
||||||
spin_lock(&hvc_structs_lock);
|
spin_lock(&hvc_structs_lock);
|
||||||
list_for_each_entry(hp, &hvc_structs, next) {
|
list_for_each_entry(hp, &hvc_structs, next) {
|
||||||
/*hp = list_entry(node, struct hvc_struct, * next); */
|
|
||||||
poll_mask |= hvc_poll(hp);
|
poll_mask |= hvc_poll(hp);
|
||||||
}
|
}
|
||||||
spin_unlock(&hvc_structs_lock);
|
spin_unlock(&hvc_structs_lock);
|
||||||
@ -811,9 +808,8 @@ int __init hvc_init(void)
|
|||||||
{
|
{
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
/* We need more than num_vterms adapters due to hotplug additions. */
|
/* We need more than hvc_count adapters due to hotplug additions. */
|
||||||
hvc_driver = alloc_tty_driver(HVC_ALLOC_TTY_ADAPTERS);
|
hvc_driver = alloc_tty_driver(HVC_ALLOC_TTY_ADAPTERS);
|
||||||
/* hvc_driver = alloc_tty_driver(num_vterms); */
|
|
||||||
if (!hvc_driver)
|
if (!hvc_driver)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user