diff options
author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2008-04-30 15:25:55 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-05-12 11:46:54 -0400 |
commit | 7916c3548e53bffb0545a1d0dc7fde86d79add92 (patch) | |
tree | 6e0020f6f24865343938cb56ef537fd9eb0297df /arch/mips/au1000/pb1000/init.c | |
parent | abd14cc00d940b8b5b4fc92be23f656b57c6ecfe (diff) |
[MIPS] Pb1000 code style cleanup
Fix several errors and warnings given by checkpatch.pl:
- use of C99 // comments;
- brace not on the same line with condition in the 'switch' statement;
- printk() without KERN_* facility level;
- unnecessary braces for single-statement block;
- using simple_strtol() where strict_strtol() could be used.
In addition to these changes, also do the following:
- properly indent the 'switch' statement;
- remove needless parentheses;
- insert spaces between operator and its operands;
- replace numeric literals/expressions with the matching macros;
- remove useless #if dirctive from board_setup();
- remove unneeded numeric literal type casts;
- remove space after the type cast's closing parenthesis;
- replace spaces after the macro name with tabs in the #define directives, and
sometimes insert spaces there;
- remove excess new lines;
- fix typos/errors, capitalize acronyms, etc. in the comments;
- make the multi-line comment style consistent with the kernel style elsewhere
by adding empty first/last line;
- combine some comments;
- update MontaVista copyright;
- remove Pete Popov's old email address...
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/au1000/pb1000/init.c')
-rw-r--r-- | arch/mips/au1000/pb1000/init.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/arch/mips/au1000/pb1000/init.c b/arch/mips/au1000/pb1000/init.c index 549447df71d6..3837365d613d 100644 --- a/arch/mips/au1000/pb1000/init.c +++ b/arch/mips/au1000/pb1000/init.c | |||
@@ -1,10 +1,9 @@ | |||
1 | /* | 1 | /* |
2 | * BRIEF MODULE DESCRIPTION | 2 | * BRIEF MODULE DESCRIPTION |
3 | * PB1000 board setup | 3 | * Pb1000 board setup |
4 | * | 4 | * |
5 | * Copyright 2001 MontaVista Software Inc. | 5 | * Copyright 2001, 2008 MontaVista Software Inc. |
6 | * Author: MontaVista Software, Inc. | 6 | * Author: MontaVista Software, Inc. <source@mvista.com> |
7 | * ppopov@mvista.com or source@mvista.com | ||
8 | * | 7 | * |
9 | * This program is free software; you can redistribute it and/or modify it | 8 | * This program is free software; you can redistribute it and/or modify it |
10 | * under the terms of the GNU General Public License as published by the | 9 | * under the terms of the GNU General Public License as published by the |
@@ -44,16 +43,15 @@ void __init prom_init(void) | |||
44 | unsigned char *memsize_str; | 43 | unsigned char *memsize_str; |
45 | unsigned long memsize; | 44 | unsigned long memsize; |
46 | 45 | ||
47 | prom_argc = (int) fw_arg0; | 46 | prom_argc = (int)fw_arg0; |
48 | prom_argv = (char **) fw_arg1; | 47 | prom_argv = (char **)fw_arg1; |
49 | prom_envp = (char **) fw_arg2; | 48 | prom_envp = (char **)fw_arg2; |
50 | 49 | ||
51 | prom_init_cmdline(); | 50 | prom_init_cmdline(); |
52 | memsize_str = prom_getenv("memsize"); | 51 | memsize_str = prom_getenv("memsize"); |
53 | if (!memsize_str) { | 52 | if (!memsize_str) |
54 | memsize = 0x04000000; | 53 | memsize = 0x04000000; |
55 | } else { | 54 | else |
56 | memsize = simple_strtol(memsize_str, NULL, 0); | 55 | memsize = strict_strtol(memsize_str, 0, NULL); |
57 | } | ||
58 | add_memory_region(0, memsize, BOOT_MEM_RAM); | 56 | add_memory_region(0, memsize, BOOT_MEM_RAM); |
59 | } | 57 | } |