[PATCH 31/35] MIPS: RB532: Cleanup files effected by firmware changes.
From: Steven J. Hill <hidden>
Date: 2012-06-05 21:56:38
Subsystem:
mips, the rest · Maintainers:
Thomas Bogendoerfer, Linus Torvalds
From: "Steven J. Hill" <redacted> Make headers consistent across the files and make changes based on running the checkpatch script. Signed-off-by: Steven J. Hill <redacted> --- arch/mips/rb532/prom.c | 40 +++++++++++----------------------------- 1 file changed, 11 insertions(+), 29 deletions(-)
diff --git a/arch/mips/rb532/prom.c b/arch/mips/rb532/prom.c
index 54f5399..5bddd0b 100644
--- a/arch/mips/rb532/prom.c
+++ b/arch/mips/rb532/prom.c@@ -1,37 +1,19 @@ /* - * RouterBoard 500 specific prom routines + * 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. * - * Copyright (C) 2003, Peter Sadik <peter.sadik@idt.com> - * Copyright (C) 2005-2006, P.Christeas <p_christ@hol.gr> - * Copyright (C) 2007, Gabor Juhos <juhosg@openwrt.org> - * Felix Fietkau <nbd@openwrt.org> - * Florian Fainelli <florian@openwrt.org> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that 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 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., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * RouterBoard 500 specific prom routines * + * Copyright (C) 2003, Peter Sadik <peter.sadik@idt.com> + * Copyright (C) 2005-2006, P.Christeas <p_christ@hol.gr> + * Copyright (C) 2007, Gabor Juhos <juhosg@openwrt.org> + * Felix Fietkau <nbd@openwrt.org> + * Florian Fainelli <florian@openwrt.org> + * Copyright (C) 2012 MIPS Technologies, Inc. All rights reserved. */ - -#include <linux/init.h> -#include <linux/mm.h> #include <linux/module.h> #include <linux/string.h> -#include <linux/console.h> -#include <linux/bootmem.h> -#include <linux/ioport.h> -#include <linux/blkdev.h> #include <asm/fw/fw.h> #include <asm/mach-rc32434/ddr.h>
@@ -129,7 +111,7 @@ void __init prom_init(void) ddr_reg[0].end - ddr_reg[0].start); if (!ddr) { - printk(KERN_ERR "Unable to remap DDR register\n"); + pr_err("Unable to remap DDR register\n"); return; }
--
1.7.10.3