The ePAPR hypervisor byte channel console driver only supports one byte
channel as a console, and the byte channel handle is stored in a global
variable.  It doesn't make any sense to pass that handle as a parameter
to the console functions, since these functions already have access to the
global variable.

Signed-off-by: Timur Tabi <ti...@freescale.com>
---
 drivers/tty/ehv_bytechan.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/tty/ehv_bytechan.c b/drivers/tty/ehv_bytechan.c
index f733718..1595dba 100644
--- a/drivers/tty/ehv_bytechan.c
+++ b/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. */
-- 
1.7.4.4


_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Reply via email to