[PATCH 17/35] MIPS: Lasat: Cleanup files effected by firmware changes.
From: Steven J. Hill <hidden>
Date: 2012-06-05 21:59:30
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/lasat/prom.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/arch/mips/lasat/prom.c b/arch/mips/lasat/prom.c
index 8bd3994..0091351 100644
--- a/arch/mips/lasat/prom.c
+++ b/arch/mips/lasat/prom.c@@ -2,19 +2,18 @@ * PROM interface routines. */ #include <linux/types.h> -#include <linux/init.h> #include <linux/string.h> #include <linux/ctype.h> -#include <linux/kernel.h> #include <linux/mm.h> #include <linux/bootmem.h> #include <linux/ioport.h> +#include <linux/cpu.h> + #include <asm/fw/fw.h> #include <asm/lasat/lasat.h> -#include <asm/cpu.h> +#include <asm/lasat/eeprom.h> #include "at93c.h" -#include <asm/lasat/eeprom.h> #include "prom.h" #define RESET_VECTOR 0xbfc00000
@@ -58,7 +57,7 @@ static void setup_prom_vectors(void) __prom_putc = (void *)PROM_PUTC_ADDR; prom_monitor = (void *)PROM_MONITOR_ADDR; } - printk(KERN_DEBUG "prom vectors set up\n"); + pr_debug("prom vectors set up\n"); } static struct at93c_defs at93c_defs[N_MACHTYPES] = {
@@ -84,11 +83,11 @@ void __init prom_init(void) setup_prom_vectors(); if (IS_LASAT_200()) { - printk(KERN_INFO "LASAT 200 board\n"); + pr_info("LASAT 200 board\n"); lasat_ndelay_divider = LASAT_200_DIVIDER; at93c = &at93c_defs[1]; } else { - printk(KERN_INFO "LASAT 100 board\n"); + pr_info("LASAT 100 board\n"); lasat_ndelay_divider = LASAT_100_DIVIDER; at93c = &at93c_defs[0]; }
--
1.7.10.3