diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-08-16 02:13:06 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-08-16 02:59:27 +0200 |
| commit | afbcdd97bf117bc2d01b865a32f78f662437a4d8 (patch) | |
| tree | b170f30f16bb8bb77477326ad604de7c49808a60 /arch | |
| parent | powerpc: Make rwlocks endian safe (diff) | |
| download | linux-afbcdd97bf117bc2d01b865a32f78f662437a4d8.tar.xz linux-afbcdd97bf117bc2d01b865a32f78f662437a4d8.zip | |
powerpc/wsp: Fix early debug build
When reworking udbg_16550.c I forgot to remove the old and now useless
code for the CONFIG_PPC_EARLY_DEBUG_WSP case, which doesn't build as
a result. I also missed a cast.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/udbg_16550.c | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/arch/powerpc/kernel/udbg_16550.c b/arch/powerpc/kernel/udbg_16550.c index 25c58e81a009..75702e207b29 100644 --- a/arch/powerpc/kernel/udbg_16550.c +++ b/arch/powerpc/kernel/udbg_16550.c @@ -300,45 +300,9 @@ void __init udbg_init_40x_realmode(void) #ifdef CONFIG_PPC_EARLY_DEBUG_WSP -static void udbg_wsp_flush(void) -{ - if (udbg_comport) { - while ((readb(&udbg_comport->lsr) & LSR_THRE) == 0) - /* wait for idle */; - } -} - -static void udbg_wsp_putc(char c) -{ - if (udbg_comport) { - if (c == '\n') - udbg_wsp_putc('\r'); - udbg_wsp_flush(); - writeb(c, &udbg_comport->thr); eieio(); - } -} - -static int udbg_wsp_getc(void) -{ - if (udbg_comport) { - while ((readb(&udbg_comport->lsr) & LSR_DR) == 0) - ; /* wait for char */ - return readb(&udbg_comport->rbr); - } - return -1; -} - -static int udbg_wsp_getc_poll(void) -{ - if (udbg_comport) - if (readb(&udbg_comport->lsr) & LSR_DR) - return readb(&udbg_comport->rbr); - return -1; -} - void __init udbg_init_wsp(void) { - udbg_uart_init_mmio(WSP_UART_VIRT, 1); + udbg_uart_init_mmio((void *)WSP_UART_VIRT, 1); udbg_uart_setup(57600, 50000000); } |