diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:30:10 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:30:10 -0500 |
commit | a4ec1effce83796209a0258602b0cf50026d86f2 (patch) | |
tree | 557df52f7a541b7b3e9762b3ad379bf98349bfb8 /arch/x86/mach-voyager/setup.c | |
parent | 31183ba8fd05b6ddc67ab4d726167cbc52e1b346 (diff) |
x86: mach-voyager, lindent
lindent the mach-voyager files to get rid of more than 300 style errors:
errors lines of code errors/KLOC
arch/x86/mach-voyager/ [old] 409 3729 109.6
arch/x86/mach-voyager/ [new] 71 3678 19.3
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/mach-voyager/setup.c')
-rw-r--r-- | arch/x86/mach-voyager/setup.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/arch/x86/mach-voyager/setup.c b/arch/x86/mach-voyager/setup.c index 3bef977cb29b..81257a861984 100644 --- a/arch/x86/mach-voyager/setup.c +++ b/arch/x86/mach-voyager/setup.c | |||
@@ -44,7 +44,7 @@ void __init trap_init_hook(void) | |||
44 | { | 44 | { |
45 | } | 45 | } |
46 | 46 | ||
47 | static struct irqaction irq0 = { | 47 | static struct irqaction irq0 = { |
48 | .handler = timer_interrupt, | 48 | .handler = timer_interrupt, |
49 | .flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_IRQPOLL, | 49 | .flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_IRQPOLL, |
50 | .mask = CPU_MASK_NONE, | 50 | .mask = CPU_MASK_NONE, |
@@ -59,44 +59,47 @@ void __init time_init_hook(void) | |||
59 | 59 | ||
60 | /* Hook for machine specific memory setup. */ | 60 | /* Hook for machine specific memory setup. */ |
61 | 61 | ||
62 | char * __init machine_specific_memory_setup(void) | 62 | char *__init machine_specific_memory_setup(void) |
63 | { | 63 | { |
64 | char *who; | 64 | char *who; |
65 | 65 | ||
66 | who = "NOT VOYAGER"; | 66 | who = "NOT VOYAGER"; |
67 | 67 | ||
68 | if(voyager_level == 5) { | 68 | if (voyager_level == 5) { |
69 | __u32 addr, length; | 69 | __u32 addr, length; |
70 | int i; | 70 | int i; |
71 | 71 | ||
72 | who = "Voyager-SUS"; | 72 | who = "Voyager-SUS"; |
73 | 73 | ||
74 | e820.nr_map = 0; | 74 | e820.nr_map = 0; |
75 | for(i=0; voyager_memory_detect(i, &addr, &length); i++) { | 75 | for (i = 0; voyager_memory_detect(i, &addr, &length); i++) { |
76 | add_memory_region(addr, length, E820_RAM); | 76 | add_memory_region(addr, length, E820_RAM); |
77 | } | 77 | } |
78 | return who; | 78 | return who; |
79 | } else if(voyager_level == 4) { | 79 | } else if (voyager_level == 4) { |
80 | __u32 tom; | 80 | __u32 tom; |
81 | __u16 catbase = inb(VOYAGER_SSPB_RELOCATION_PORT)<<8; | 81 | __u16 catbase = inb(VOYAGER_SSPB_RELOCATION_PORT) << 8; |
82 | /* select the DINO config space */ | 82 | /* select the DINO config space */ |
83 | outb(VOYAGER_DINO, VOYAGER_CAT_CONFIG_PORT); | 83 | outb(VOYAGER_DINO, VOYAGER_CAT_CONFIG_PORT); |
84 | /* Read DINO top of memory register */ | 84 | /* Read DINO top of memory register */ |
85 | tom = ((inb(catbase + 0x4) & 0xf0) << 16) | 85 | tom = ((inb(catbase + 0x4) & 0xf0) << 16) |
86 | + ((inb(catbase + 0x5) & 0x7f) << 24); | 86 | + ((inb(catbase + 0x5) & 0x7f) << 24); |
87 | 87 | ||
88 | if(inb(catbase) != VOYAGER_DINO) { | 88 | if (inb(catbase) != VOYAGER_DINO) { |
89 | printk(KERN_ERR "Voyager: Failed to get DINO for L4, setting tom to EXT_MEM_K\n"); | 89 | printk(KERN_ERR |
90 | tom = (boot_params.screen_info.ext_mem_k)<<10; | 90 | "Voyager: Failed to get DINO for L4, setting tom to EXT_MEM_K\n"); |
91 | tom = (boot_params.screen_info.ext_mem_k) << 10; | ||
91 | } | 92 | } |
92 | who = "Voyager-TOM"; | 93 | who = "Voyager-TOM"; |
93 | add_memory_region(0, 0x9f000, E820_RAM); | 94 | add_memory_region(0, 0x9f000, E820_RAM); |
94 | /* map from 1M to top of memory */ | 95 | /* map from 1M to top of memory */ |
95 | add_memory_region(1*1024*1024, tom - 1*1024*1024, E820_RAM); | 96 | add_memory_region(1 * 1024 * 1024, tom - 1 * 1024 * 1024, |
97 | E820_RAM); | ||
96 | /* FIXME: Should check the ASICs to see if I need to | 98 | /* FIXME: Should check the ASICs to see if I need to |
97 | * take out the 8M window. Just do it at the moment | 99 | * take out the 8M window. Just do it at the moment |
98 | * */ | 100 | * */ |
99 | add_memory_region(8*1024*1024, 8*1024*1024, E820_RESERVED); | 101 | add_memory_region(8 * 1024 * 1024, 8 * 1024 * 1024, |
102 | E820_RESERVED); | ||
100 | return who; | 103 | return who; |
101 | } | 104 | } |
102 | 105 | ||
@@ -114,8 +117,7 @@ char * __init machine_specific_memory_setup(void) | |||
114 | unsigned long mem_size; | 117 | unsigned long mem_size; |
115 | 118 | ||
116 | /* compare results from other methods and take the greater */ | 119 | /* compare results from other methods and take the greater */ |
117 | if (boot_params.alt_mem_k | 120 | if (boot_params.alt_mem_k < boot_params.screen_info.ext_mem_k) { |
118 | < boot_params.screen_info.ext_mem_k) { | ||
119 | mem_size = boot_params.screen_info.ext_mem_k; | 121 | mem_size = boot_params.screen_info.ext_mem_k; |
120 | who = "BIOS-88"; | 122 | who = "BIOS-88"; |
121 | } else { | 123 | } else { |
@@ -126,6 +128,6 @@ char * __init machine_specific_memory_setup(void) | |||
126 | e820.nr_map = 0; | 128 | e820.nr_map = 0; |
127 | add_memory_region(0, LOWMEMSIZE(), E820_RAM); | 129 | add_memory_region(0, LOWMEMSIZE(), E820_RAM); |
128 | add_memory_region(HIGH_MEMORY, mem_size << 10, E820_RAM); | 130 | add_memory_region(HIGH_MEMORY, mem_size << 10, E820_RAM); |
129 | } | 131 | } |
130 | return who; | 132 | return who; |
131 | } | 133 | } |