Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49bffbdc authored by Steven J. Hill's avatar Steven J. Hill Committed by Ralf Baechle
Browse files

MIPS: FW: malta: Code formatting clean-ups. 



Clean-up code according to the 'checkpatch.pl' script.

Signed-off-by: default avatarSteven J. Hill <Steven.Hill@imgtec.com>
parent 270690e0

arch/mips/mti-malta/malta-display.c

+15 −22
Original line number Diff line number Diff line 
/*

 * Carsten Langgaard, carstenl@mips.com

 * Copyright (C) 1999,2000 MIPS Technologies, Inc.  All rights reserved.

 *

 *  This program is free software; you can distribute it and/or modify it

 *  under the terms of the GNU General Public License (Version 2) as

 *  published by the Free Software Foundation.

 *

 *  This program is distributed in the hope it will be useful, but WITHOUT

 *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 *  You should have received a copy of the GNU General Public License along

 *  with this program; if not, write to the Free Software Foundation, Inc.,

 *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.

 *

 * Display routines for display messages in MIPS boards ascii display.

 *

 * Copyright (C) 1999,2000,2012  MIPS Technologies, Inc.

 * All rights reserved.

 * Authors: Carsten Langgaard <carstenl@mips.com>

 *          Steven J. Hill <sjhill@mips.com>

 */



#include <linux/compiler.h>

#include <linux/timer.h>

#include <asm/io.h>

#include <linux/io.h>



#include <asm/mips-boards/generic.h>



extern const char display_string[];
@@ -35,7 +28,7 @@ void mips_display_message(const char *str) 
	if (unlikely(display == NULL))

		display = ioremap(ASCII_DISPLAY_POS_BASE, 16*sizeof(int));



	for (i = 0; i <= 14; i=i+2) {

	for (i = 0; i <= 14; i += 2) {

		if (*str)

			__raw_writel(*str++, display + i);

		else

arch/mips/mti-malta/malta-init.c

+25 −33
Original line number Diff line number Diff line 
/*

 * Copyright (C) 1999, 2000, 2004, 2005	 MIPS Technologies, Inc.

 *	All rights reserved.

 *	Authors: Carsten Langgaard <carstenl@mips.com>

 *		 Maciej W. Rozycki <macro@mips.com>

 *

 *  This program is free software; you can distribute it and/or modify it

 *  under the terms of the GNU General Public License (Version 2) as

 *  published by the Free Software Foundation.

 *

 *  This program is distributed in the hope it will be useful, but WITHOUT

 *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 *  You should have received a copy of the GNU General Public License along

 *  with this program; if not, write to the Free Software Foundation, Inc.,

 *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.

 *

 * PROM library initialisation code.

 *

 * Copyright (C) 1999,2000,2004,2005,2012  MIPS Technologies, Inc.

 * All rights reserved.

 * Authors: Carsten Langgaard <carstenl@mips.com>

 *         Maciej W. Rozycki <macro@mips.com>

 *          Steven J. Hill <sjhill@mips.com>

 */

#include <linux/init.h>

#include <linux/string.h>

#include <linux/kernel.h>



#include <asm/gt64120.h>

#include <asm/io.h>

#include <asm/cacheflush.h>

#include <asm/smp-ops.h>

#include <asm/traps.h>

#include <asm/fw/fw.h>

#include <asm/gcmpregs.h>

#include <asm/mips-boards/generic.h>

#include <asm/mips-boards/bonito64.h>

#include <asm/mips-boards/msc01_pci.h>



#include <asm/mips-boards/malta.h>



int init_debug;



static int mips_revision_corid;

int mips_revision_sconid;
@@ -64,12 +49,18 @@ static void __init console_config(void) 
		if (s) {

			while (*s >= '0' && *s <= '9')

				baud = baud*10 + *s++ - '0';

			if (*s == ',') s++;

			if (*s) parity = *s++;

			if (*s == ',') s++;

			if (*s) bits = *s++;

			if (*s == ',') s++;

			if (*s == 'h') flow = 'r';

			if (*s == ',')

				s++;

			if (*s)

				parity = *s++;

			if (*s == ',')

				s++;

			if (*s)

				bits = *s++;

			if (*s == ',')

				s++;

			if (*s == 'h')

				flow = 'r';

		}

		if (baud == 0)

			baud = 38400;
@@ -79,7 +70,8 @@ static void __init console_config(void) 
			bits = '8';

		if (flow == '\0')

			flow = 'r';

		sprintf(console_string, " console=ttyS0,%d%c%c%c", baud, parity, bits, flow);

		sprintf(console_string, " console=ttyS0,%d%c%c%c", baud,

			parity, bits, flow);

		strcat(fw_getcmdline(), console_string);

		pr_info("Config serial console:%s\n", console_string);

	}

arch/mips/mti-malta/malta-memory.c

+17 −25
Original line number Diff line number Diff line 
/*

 * Carsten Langgaard, carstenl@mips.com

 * Copyright (C) 1999,2000 MIPS Technologies, Inc.  All rights reserved.

 *

 *  This program is free software; you can distribute it and/or modify it

 *  under the terms of the GNU General Public License (Version 2) as

 *  published by the Free Software Foundation.

 *

 *  This program is distributed in the hope it will be useful, but WITHOUT

 *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 *  You should have received a copy of the GNU General Public License along

 *  with this program; if not, write to the Free Software Foundation, Inc.,

 *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.

 *

 * PROM library functions for acquiring/using memory descriptors given to

 * us from the YAMON.

 *

 * Copyright (C) 1999,2000,2012  MIPS Technologies, Inc.

 * All rights reserved.

 * Authors: Carsten Langgaard <carstenl@mips.com>

 *          Steven J. Hill <sjhill@mips.com>

 */

#include <linux/init.h>

#include <linux/mm.h>

#include <linux/bootmem.h>

#include <linux/pfn.h>

#include <linux/string.h>



#include <asm/bootinfo.h>

#include <asm/page.h>

#include <asm/sections.h>

#include <asm/fw/fw.h>
@@ -36,19 +26,20 @@ unsigned long physical_memsize = 0L; 


fw_memblock_t * __init fw_getmdesc(void)

{

	char *memsize_str;

	char *memsize_str, *ptr;

	unsigned int memsize;

	char *ptr;

	static char cmdline[COMMAND_LINE_SIZE] __initdata;

	long val;

	int tmp;



	/* otherwise look in the environment */

	memsize_str = fw_getenv("memsize");

	if (!memsize_str) {

		printk(KERN_WARNING

		       "memsize not set in boot prom, set to default (32Mb)\n");

		pr_warn("memsize not set in YAMON, set to default (32Mb)\n");

		physical_memsize = 0x02000000;

	} else {

		physical_memsize = simple_strtol(memsize_str, NULL, 0);

		tmp = kstrtol(memsize_str, 0, &val);

		physical_memsize = (unsigned long)val;

	}



#ifdef CONFIG_CPU_BIG_ENDIAN
@@ -92,7 +83,8 @@ fw_memblock_t * __init fw_getmdesc(void) 


	mdesc[3].type = fw_dontuse;

	mdesc[3].base = 0x00100000;

	mdesc[3].size = CPHYSADDR(PFN_ALIGN((unsigned long)&_end)) - mdesc[3].base;

	mdesc[3].size = CPHYSADDR(PFN_ALIGN((unsigned long)&_end)) -

		mdesc[3].base;



	mdesc[4].type = fw_free;

	mdesc[4].base = CPHYSADDR(PFN_ALIGN(&_end));
@@ -142,7 +134,7 @@ void __init prom_free_prom_memory(void) 
			continue;



		addr = boot_mem_map.map[i].addr;

		free_init_pages("prom memory",

		free_init_pages("YAMON memory",

				addr, addr + boot_mem_map.map[i].size);

	}

}

arch/mips/mti-malta/malta-setup.c

+7 −8
Original line number Diff line number Diff line
@@ -178,13 +178,12 @@ static void __init pci_clock_check(void) 
	char *argptr = fw_getcmdline();



	if (pciclock != 33 && !strstr(argptr, "idebus=")) {

		printk(KERN_WARNING "WARNING: PCI clock is %dMHz, "

				"setting idebus\n", pciclock);

		pr_warn("WARNING: PCI clock is %dMHz, setting idebus\n",

			pciclock);

		argptr += strlen(argptr);

		sprintf(argptr, " idebus=%d", pciclock);

		if (pciclock < 20 || pciclock > 66)

			printk(KERN_WARNING "WARNING: IDE timing "

					"calculations will be incorrect\n");

			pr_warn("WARNING: IDE timing calculations will be incorrect\n");

	}

}

#endif
@@ -216,14 +215,14 @@ static void __init bonito_quirks_setup(void) 
	argptr = fw_getcmdline();

	if (strstr(argptr, "debug")) {

		BONITO_BONGENCFG |= BONITO_BONGENCFG_DEBUGMODE;

		printk(KERN_INFO "Enabled Bonito debug mode\n");

		pr_info("Enabled Bonito debug mode\n");

	} else

		BONITO_BONGENCFG &= ~BONITO_BONGENCFG_DEBUGMODE;



#ifdef CONFIG_DMA_COHERENT

	if (BONITO_PCICACHECTRL & BONITO_PCICACHECTRL_CPUCOH_PRES) {

		BONITO_PCICACHECTRL |= BONITO_PCICACHECTRL_CPUCOH_EN;

		printk(KERN_INFO "Enabled Bonito CPU coherency\n");

		pr_info("Enabled Bonito CPU coherency\n");



		argptr = fw_getcmdline();

		if (strstr(argptr, "iobcuncached")) {
@@ -231,13 +230,13 @@ static void __init bonito_quirks_setup(void) 
			BONITO_PCIMEMBASECFG = BONITO_PCIMEMBASECFG &

				~(BONITO_PCIMEMBASECFG_MEMBASE0_CACHED |

					BONITO_PCIMEMBASECFG_MEMBASE1_CACHED);

			printk(KERN_INFO "Disabled Bonito IOBC coherency\n");

			pr_info("Disabled Bonito IOBC coherency\n");

		} else {

			BONITO_PCICACHECTRL |= BONITO_PCICACHECTRL_IOBCCOH_EN;

			BONITO_PCIMEMBASECFG |=

				(BONITO_PCIMEMBASECFG_MEMBASE0_CACHED |

					BONITO_PCIMEMBASECFG_MEMBASE1_CACHED);

			printk(KERN_INFO "Enabled Bonito IOBC coherency\n");

			pr_info("Enabled Bonito IOBC coherency\n");

		}

	} else

		panic("Hardware DMA cache coherency not supported");