From 73e8a03e00e3774f38d8b80a4de231eb93a0b68d Mon Sep 17 00:00:00 2001 From: Milton Miller Date: Tue, 6 Sep 2005 11:55:00 +1000 Subject: [PATCH] --- yaml --- r: 7293 b: refs/heads/master c: cb14c4d641b4e083fae7ce4a0e8a3973cecb7554 h: refs/heads/master i: 7291: 5957a32fe2a3ccdb05514095f1ee234f4cf416ed v: v3 --- [refs] | 2 +- trunk/arch/ppc64/kernel/udbg.c | 16 ++++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 804f524cef4e..15e96eee56f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5fdabaab01ee8928597aae8a0178a3a4f7b66365 +refs/heads/master: cb14c4d641b4e083fae7ce4a0e8a3973cecb7554 diff --git a/trunk/arch/ppc64/kernel/udbg.c b/trunk/arch/ppc64/kernel/udbg.c index c0da45540f0f..155670a40c3b 100644 --- a/trunk/arch/ppc64/kernel/udbg.c +++ b/trunk/arch/ppc64/kernel/udbg.c @@ -169,12 +169,8 @@ void udbg_maple_real_putc(unsigned char c) while ((real_readb(&udbg_comport->lsr) & LSR_THRE) == 0) /* wait for idle */; real_writeb(c, &udbg_comport->thr); eieio(); - if (c == '\n') { - /* Also put a CR. This is for convenience. */ - while ((real_readb(&udbg_comport->lsr) & LSR_THRE) == 0) - /* wait for idle */; - real_writeb('\r', &udbg_comport->thr); eieio(); - } + if (c == '\n') + udbg_maple_real_putc('\r'); } } @@ -194,12 +190,8 @@ void udbg_putc(unsigned char c) while ((in_8(&udbg_comport->lsr) & LSR_THRE) == 0) /* wait for idle */; out_8(&udbg_comport->thr, c); - if (c == '\n') { - /* Also put a CR. This is for convenience. */ - while ((in_8(&udbg_comport->lsr) & LSR_THRE) == 0) - /* wait for idle */; - out_8(&udbg_comport->thr, '\r'); - } + if (c == '\n') + udbg_putc('\r'); } #ifdef CONFIG_PPC_PMAC else if (sccc) {