Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-13 16:50:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] powerpc: Cleanup hvc_rtas.c a little

Browse Source 
A few cleanups in hvc_rtas.c:
 1. Remove unused RTASCONS_PUT_ATTEMPTS
 2. Remove unused rtascons_put_delay.
 3. Use i as a loop counter like everyone else on earth.
 4. Remove pointless variables, eg. x = foo; if (x) return something_else;
 5. Whitespace cleanups and formatting.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Michael Ellerman 2006-06-07 17:10:09 +10:00 committed by Paul Mackerras
parent b53744612f
commit 6b81e80049
1 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
drivers/char/hvc_rtas.c
View File

@ -41,37 +41,28 @@
#define hvc_rtas_cookie 0x67781e15 #define hvc_rtas_cookie 0x67781e15
struct hvc_struct *hvc_rtas_dev; struct hvc_struct *hvc_rtas_dev;
#define RTASCONS_PUT_ATTEMPTS 16
static int rtascons_put_char_token = RTAS_UNKNOWN_SERVICE; static int rtascons_put_char_token = RTAS_UNKNOWN_SERVICE;
static int rtascons_get_char_token = RTAS_UNKNOWN_SERVICE; static int rtascons_get_char_token = RTAS_UNKNOWN_SERVICE;
static int rtascons_put_delay = 100;
module_param_named(put_delay, rtascons_put_delay, int, 0644);
static inline int hvc_rtas_write_console(uint32_t vtermno, const char *buf, int count) static inline int hvc_rtas_write_console(uint32_t vtermno, const char *buf,
{ int count)
int done;
/* if there is more than one character to be displayed, wait a bit */
for (done = 0; done < count; done++) {
int result;
result = rtas_call(rtascons_put_char_token, 1, 1, NULL, buf[done]);
if (result)
break;
}
/* the calling routine expects to receive the number of bytes sent */
return done;
}
static int hvc_rtas_read_console(uint32_t vtermno, char *buf, int count)
{ {
int i; int i;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
int c, err; if (rtas_call(rtascons_put_char_token, 1, 1, NULL, buf[i]))
break;
}
err = rtas_call(rtascons_get_char_token, 0, 2, &c); return i;
if (err) }
static int hvc_rtas_read_console(uint32_t vtermno, char *buf, int count)
{
int i, c;
for (i = 0; i < count; i++) {
if (rtas_call(rtascons_get_char_token, 0, 2, &c))
break; break;
buf[i] = c; buf[i] = c;
@ -106,7 +97,9 @@ static int hvc_rtas_init(void)
hp = hvc_alloc(hvc_rtas_cookie, NO_IRQ, &hvc_rtas_get_put_ops); hp = hvc_alloc(hvc_rtas_cookie, NO_IRQ, &hvc_rtas_get_put_ops);
if (IS_ERR(hp)) if (IS_ERR(hp))
return PTR_ERR(hp); return PTR_ERR(hp);
hvc_rtas_dev = hp; hvc_rtas_dev = hp;
return 0; return 0;
} }
module_init(hvc_rtas_init); module_init(hvc_rtas_init);
@ -114,8 +107,8 @@ module_init(hvc_rtas_init);
/* This will tear down the tty portion of the driver */ /* This will tear down the tty portion of the driver */
static void __exit hvc_rtas_exit(void) static void __exit hvc_rtas_exit(void)
{ {
/* Really the fun isn't over until the worker thread breaks down and the /* Really the fun isn't over until the worker thread breaks down and
* tty cleans up */ * the tty cleans up */
if (hvc_rtas_dev) if (hvc_rtas_dev)
hvc_remove(hvc_rtas_dev); hvc_remove(hvc_rtas_dev);
} }
@ -127,12 +120,14 @@ static int hvc_rtas_console_init(void)
rtascons_put_char_token = rtas_token("put-term-char"); rtascons_put_char_token = rtas_token("put-term-char");
if (rtascons_put_char_token == RTAS_UNKNOWN_SERVICE) if (rtascons_put_char_token == RTAS_UNKNOWN_SERVICE)
return -EIO; return -EIO;
rtascons_get_char_token = rtas_token("get-term-char"); rtascons_get_char_token = rtas_token("get-term-char");
if (rtascons_get_char_token == RTAS_UNKNOWN_SERVICE) if (rtascons_get_char_token == RTAS_UNKNOWN_SERVICE)
return -EIO; return -EIO;
hvc_instantiate(hvc_rtas_cookie, 0, &hvc_rtas_get_put_ops ); hvc_instantiate(hvc_rtas_cookie, 0, &hvc_rtas_get_put_ops);
add_preferred_console("hvc", 0, NULL); add_preferred_console("hvc", 0, NULL);
return 0; return 0;
} }
console_initcall(hvc_rtas_console_init); console_initcall(hvc_rtas_console_init);