From aebd96075988295daa3c43208dadb7d4a925b3bb Mon Sep 17 00:00:00 2001 From: Timur Tabi Date: Thu, 22 Sep 2011 20:33:13 -0500 Subject: [PATCH] --- yaml --- r: 267342 b: refs/heads/master c: fd01a7a1bf6722e32efa679f15507148784af1f7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/ehv_bytechan.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index bed4970300d1..8ac1b10d615b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9cfb5c05fee914cc65d4706801f6bc424082b5f5 +refs/heads/master: fd01a7a1bf6722e32efa679f15507148784af1f7 diff --git a/trunk/drivers/tty/ehv_bytechan.c b/trunk/drivers/tty/ehv_bytechan.c index f733718bf8e7..1595dba0072c 100644 --- a/trunk/drivers/tty/ehv_bytechan.c +++ b/trunk/drivers/tty/ehv_bytechan.c @@ -282,7 +282,6 @@ static int ehv_bc_console_byte_channel_send(unsigned int handle, const char *s, static void ehv_bc_console_write(struct console *co, const char *s, unsigned int count) { - unsigned int handle = (uintptr_t)co->data; char s2[EV_BYTE_CHANNEL_MAX_BYTES]; unsigned int i, j = 0; char c; @@ -295,14 +294,14 @@ static void ehv_bc_console_write(struct console *co, const char *s, s2[j++] = c; if (j >= (EV_BYTE_CHANNEL_MAX_BYTES - 1)) { - if (ehv_bc_console_byte_channel_send(handle, s2, j)) + if (ehv_bc_console_byte_channel_send(stdout_bc, s2, j)) return; j = 0; } } if (j) - ehv_bc_console_byte_channel_send(handle, s2, j); + ehv_bc_console_byte_channel_send(stdout_bc, s2, j); } /* @@ -348,8 +347,6 @@ static int __init ehv_bc_console_init(void) CONFIG_PPC_EARLY_DEBUG_EHV_BC_HANDLE); #endif - ehv_bc_console.data = (void *)(uintptr_t)stdout_bc; - /* add_preferred_console() must be called before register_console(), otherwise it won't work. However, we don't want to enumerate all the byte channels here, either, since we only care about one. */