Skip to content

Commit

Permalink
drivers/tty: don't use the byte channel handle as a parameter in ehv_…
Browse files Browse the repository at this point in the history
…bytechan.c

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 <timur@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Timur Tabi authored and Greg Kroah-Hartman committed Sep 26, 2011
1 parent 9cfb5c0 commit fd01a7a
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/tty/ehv_bytechan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
}

/*
Expand Down Expand Up @@ -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. */
Expand Down

0 comments on commit fd01a7a

Please sign in to comment.