From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Michael Neuling To: linuxppc-dev@ozlabs.org MIME-Version: 1.0 Subject: [PATCH] powerpc: legacy_serial loop cleanup Date: Fri, 24 Mar 2006 15:17:27 +1100 Sender: mikey@ozlabs.org Message-Id: <20060324041727.F131267B56@ozlabs.org> Cc: michael@ellerman.id.au Reply-To: mikey@neuling.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , We only ever execute the loop once, so let's move it to a function making it more readable. Cleanup patch, no functional change. Signed-off-by: Michael Neuling --- arch/powerpc/kernel/legacy_serial.c | 39 +++++++++++++++++++----------------- 1 files changed, 21 insertions(+), 18 deletions(-) Index: linux-2.6-linus/arch/powerpc/kernel/legacy_serial.c =================================================================== --- linux-2.6-linus.orig/arch/powerpc/kernel/legacy_serial.c +++ linux-2.6-linus/arch/powerpc/kernel/legacy_serial.c @@ -236,6 +236,26 @@ static int __init add_legacy_pci_port(st } #endif +static void __init setup_legacy_serial_console(int console) +{ + if (console >= 0) { + struct legacy_serial_info *info = + &legacy_serial_infos[legacy_serial_console]; + void __iomem *addr; + + if (info->taddr == 0) + return; + addr = ioremap(info->taddr, 0x1000); + if (addr == NULL) + return; + if (info->speed == 0) + info->speed = udbg_probe_uart_speed(addr, info->clock); + DBG("default console speed = %d\n", info->speed); + udbg_init_uart(addr, info->speed, info->clock); + } + return; +} + /* * This is called very early, as part of setup_system() or eventually * setup_arch(), basically before anything else in this file. This function @@ -319,24 +339,7 @@ void __init find_legacy_serial_ports(voi DBG("legacy_serial_console = %d\n", legacy_serial_console); - /* udbg is 64 bits only for now, that will change soon though ... */ - while (legacy_serial_console >= 0) { - struct legacy_serial_info *info = - &legacy_serial_infos[legacy_serial_console]; - void __iomem *addr; - - if (info->taddr == 0) - break; - addr = ioremap(info->taddr, 0x1000); - if (addr == NULL) - break; - if (info->speed == 0) - info->speed = udbg_probe_uart_speed(addr, info->clock); - DBG("default console speed = %d\n", info->speed); - udbg_init_uart(addr, info->speed, info->clock); - break; - } - + setup_legacy_serial_console(legacy_serial_console); DBG(" <- find_legacy_serial_port()\n"); }