diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/hvc_console.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c index fc9bc7709fd9..0f9ed7b46a6d 100644 --- a/drivers/char/hvc_console.c +++ b/drivers/char/hvc_console.c | |||
@@ -102,12 +102,12 @@ static DEFINE_SPINLOCK(hvc_structs_lock); | |||
102 | /* | 102 | /* |
103 | * This value is used to assign a tty->index value to a hvc_struct based | 103 | * This value is used to assign a tty->index value to a hvc_struct based |
104 | * upon order of exposure via hvc_probe(), when we can not match it to | 104 | * upon order of exposure via hvc_probe(), when we can not match it to |
105 | * a console canidate registered with hvc_instantiate(). | 105 | * a console candidate registered with hvc_instantiate(). |
106 | */ | 106 | */ |
107 | static int last_hvc = -1; | 107 | static int last_hvc = -1; |
108 | 108 | ||
109 | /* | 109 | /* |
110 | * Do not call this function with either the hvc_strucst_lock or the hvc_struct | 110 | * Do not call this function with either the hvc_structs_lock or the hvc_struct |
111 | * lock held. If successful, this function increments the kobject reference | 111 | * lock held. If successful, this function increments the kobject reference |
112 | * count against the target hvc_struct so it should be released when finished. | 112 | * count against the target hvc_struct so it should be released when finished. |
113 | */ | 113 | */ |
@@ -160,7 +160,7 @@ void hvc_console_print(struct console *co, const char *b, unsigned count) | |||
160 | if (index >= MAX_NR_HVC_CONSOLES) | 160 | if (index >= MAX_NR_HVC_CONSOLES) |
161 | return; | 161 | return; |
162 | 162 | ||
163 | /* This console adapter was removed so it is not useable. */ | 163 | /* This console adapter was removed so it is not usable. */ |
164 | if (vtermnos[index] < 0) | 164 | if (vtermnos[index] < 0) |
165 | return; | 165 | return; |
166 | 166 | ||
@@ -218,7 +218,7 @@ struct console hvc_con_driver = { | |||
218 | }; | 218 | }; |
219 | 219 | ||
220 | /* | 220 | /* |
221 | * Early console initialization. Preceeds driver initialization. | 221 | * Early console initialization. Precedes driver initialization. |
222 | * | 222 | * |
223 | * (1) we are first, and the user specified another driver | 223 | * (1) we are first, and the user specified another driver |
224 | * -- index will remain -1 | 224 | * -- index will remain -1 |
@@ -255,7 +255,7 @@ int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops) | |||
255 | if (vtermnos[index] != -1) | 255 | if (vtermnos[index] != -1) |
256 | return -1; | 256 | return -1; |
257 | 257 | ||
258 | /* make sure no no tty has been registerd in this index */ | 258 | /* make sure no no tty has been registered in this index */ |
259 | hp = hvc_get_by_index(index); | 259 | hp = hvc_get_by_index(index); |
260 | if (hp) { | 260 | if (hp) { |
261 | kobject_put(&hp->kobj); | 261 | kobject_put(&hp->kobj); |
@@ -265,7 +265,7 @@ int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops) | |||
265 | vtermnos[index] = vtermno; | 265 | vtermnos[index] = vtermno; |
266 | cons_ops[index] = ops; | 266 | cons_ops[index] = ops; |
267 | 267 | ||
268 | /* reserve all indices upto and including this index */ | 268 | /* reserve all indices up to and including this index */ |
269 | if (last_hvc < index) | 269 | if (last_hvc < index) |
270 | last_hvc = index; | 270 | last_hvc = index; |
271 | 271 | ||
@@ -526,7 +526,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count | |||
526 | 526 | ||
527 | /* | 527 | /* |
528 | * This is actually a contract between the driver and the tty layer outlining | 528 | * This is actually a contract between the driver and the tty layer outlining |
529 | * how much write room the driver can guarentee will be sent OR BUFFERED. This | 529 | * how much write room the driver can guarantee will be sent OR BUFFERED. This |
530 | * driver MUST honor the return value. | 530 | * driver MUST honor the return value. |
531 | */ | 531 | */ |
532 | static int hvc_write_room(struct tty_struct *tty) | 532 | static int hvc_write_room(struct tty_struct *tty) |
@@ -813,7 +813,7 @@ int __devexit hvc_remove(struct hvc_struct *hp) | |||
813 | 813 | ||
814 | /* | 814 | /* |
815 | * We 'put' the instance that was grabbed when the kobject instance | 815 | * We 'put' the instance that was grabbed when the kobject instance |
816 | * was intialized using kobject_init(). Let the last holder of this | 816 | * was initialized using kobject_init(). Let the last holder of this |
817 | * kobject cause it to be removed, which will probably be the tty_hangup | 817 | * kobject cause it to be removed, which will probably be the tty_hangup |
818 | * below. | 818 | * below. |
819 | */ | 819 | */ |
@@ -869,7 +869,7 @@ int __init hvc_init(void) | |||
869 | } | 869 | } |
870 | module_init(hvc_init); | 870 | module_init(hvc_init); |
871 | 871 | ||
872 | /* This isn't particularily necessary due to this being a console driver | 872 | /* This isn't particularly necessary due to this being a console driver |
873 | * but it is nice to be thorough. | 873 | * but it is nice to be thorough. |
874 | */ | 874 | */ |
875 | static void __exit hvc_exit(void) | 875 | static void __exit hvc_exit(void) |