Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / mips / ar7 / setup.c

diff --git a/arch/mips/ar7/setup.c b/arch/mips/ar7/setup.c
index 39f6b5b9646345b0def3722815656ae49c56951b..3a801d2cb6e5531ce64622c36a58e28b1263faea 100644 (file)
--- a/arch/mips/ar7/setup.c
+++ b/arch/mips/ar7/setup.c
@@ -26,8 +26,8 @@
 
 static void ar7_machine_restart(char *command)
 {
-       u32 *softres_reg = ioremap(AR7_REGS_RESET +
-                                         AR7_RESET_SOFTWARE, 1);
+       u32 *softres_reg = ioremap(AR7_REGS_RESET + AR7_RESET_SOFTWARE, 1);
+
        writel(1, softres_reg);
 }
 
@@ -41,6 +41,7 @@ static void ar7_machine_power_off(void)
 {
        u32 *power_reg = (u32 *)ioremap(AR7_REGS_POWER, 1);
        u32 power_state = readl(power_reg) | (3 << 30);
+
        writel(power_state, power_reg);
        ar7_machine_halt();
 }
@@ -49,14 +50,14 @@ const char *get_system_type(void)
 {
        u16 chip_id = ar7_chip_id();
        switch (chip_id) {
-       case AR7_CHIP_7300:
-               return "TI AR7 (TNETD7300)";
        case AR7_CHIP_7100:
                return "TI AR7 (TNETD7100)";
        case AR7_CHIP_7200:
                return "TI AR7 (TNETD7200)";
+       case AR7_CHIP_7300:
+               return "TI AR7 (TNETD7300)";
        default:
-               return "TI AR7 (Unknown)";
+               return "TI AR7 (unknown)";
        }
 }
 
@@ -70,7 +71,6 @@ console_initcall(ar7_init_console);
  * Initializes basic routines and structures pointers, memory size (as
  * given by the bios and saves the command line.
  */
-
 void __init plat_mem_setup(void)
 {
        unsigned long io_base;
@@ -88,6 +88,5 @@ void __init plat_mem_setup(void)
        prom_meminit();
 
        printk(KERN_INFO "%s, ID: 0x%04x, Revision: 0x%02x\n",
-                                       get_system_type(),
-               ar7_chip_id(), ar7_chip_rev());
+                       get_system_type(), ar7_chip_id(), ar7_chip_rev());
 }