Since some people disapprove of white space cleanups mixed in regular commits

while others dislike them being extra commits, let's clean them up once and
for all for the existing code. If it's ugly, let it only be ugly once :-)

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5507 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

6 files changed, 61 insertions, 61 deletions

diff --git a/src/mainboard/supermicro/x6dhr_ig/debug.c b/src/mainboard/supermicro/x6dhr_ig/debug.c
index b4f2a185b3..87c67b5964 100644
--- a/src/mainboard/supermicro/x6dhr_ig/debug.c
+++ b/src/mainboard/supermicro/x6dhr_ig/debug.c
@@ -5,7 +5,7 @@
 static void print_reg(unsigned char index)
 {
         unsigned char data;
-                                                                                
+
         outb(index, 0x2e);
         data = inb(0x2f);
 	print_debug("0x");
@@ -15,7 +15,7 @@ static void print_reg(unsigned char index)
 	print_debug("\n");
         return;
 }
-        
+
 static void xbus_en(void)
 {
         /* select the XBUS function in the SIO */
@@ -25,7 +25,7 @@ static void xbus_en(void)
         outb(0x01, 0x2f);
 	return;
 }
-                                                                        
+
 static void setup_func(unsigned char func)
 {
         /* select the function in the SIO */
@@ -43,27 +43,27 @@ static void setup_func(unsigned char func)
         print_reg(0x75);
         return;
 }
-                                                                                
+
 static void siodump(void)
 {
         int i;
         unsigned char data;
-       
+
 	 print_debug("\n*** SERVER I/O REGISTERS ***\n");
         for (i=0x10; i<=0x2d; i++) {
                 print_reg((unsigned char)i);
         }
-#if 0                                                                         
+#if 0
         print_debug("\n*** XBUS REGISTERS ***\n");
         setup_func(0x0f);
         for (i=0xf0; i<=0xff; i++) {
                 print_reg((unsigned char)i);
         }
-                                                                                
+
         print_debug("\n***  SERIAL 1 CONFIG REGISTERS ***\n");
         setup_func(0x03);
         print_reg(0xf0);
-                                                                                
+
         print_debug("\n***  SERIAL 2 CONFIG REGISTERS ***\n");
         setup_func(0x02);
         print_reg(0xf0);
@@ -82,13 +82,13 @@ static void siodump(void)
 	print_debug("\nGPDI 4: 0x");
 	print_debug_hex8(data);
 	print_debug("\n");
-	
-#if 0                                                                                
-                                                                                
+
+#if 0
+
         print_debug("\n***  WATCHDOG TIMER REGISTERS ***\n");
         setup_func(0x0a);
         print_reg(0xf0);
-                                                                                
+
         print_debug("\n***  FAN CONTROL REGISTERS ***\n");
         setup_func(0x09);
         print_reg(0xf0);
@@ -103,11 +103,11 @@ static void siodump(void)
         print_reg(0xf7);
         print_reg(0xfe);
         print_reg(0xff);
-                                                                                
+
         print_debug("\n***  HEALTH MONITORING & CONTROL REGISTERS ***\n");
         setup_func(0x14);
         print_reg(0xf0);
-#endif                                                                           
+#endif
         return;
 }
 
@@ -124,8 +124,8 @@ static void print_debug_pci_dev(unsigned dev)
 static void print_pci_devices(void)
 {
 	device_t dev;
-	for(dev = PCI_DEV(0, 0, 0); 
-		dev <= PCI_DEV(0, 0x1f, 0x7); 
+	for(dev = PCI_DEV(0, 0, 0);
+		dev <= PCI_DEV(0, 0x1f, 0x7);
 		dev += PCI_DEV(0,0,1)) {
 		uint32_t id;
 		id = pci_read_config32(dev, PCI_VENDOR_ID);
@@ -144,7 +144,7 @@ static void dump_pci_device(unsigned dev)
 	int i;
 	print_debug_pci_dev(dev);
 	print_debug("\n");
-	
+
 	for(i = 0; i <= 255; i++) {
 		unsigned char val;
 		if ((i & 0x0f) == 0) {
@@ -164,19 +164,19 @@ static void dump_bar14(unsigned dev)
 {
 	int i;
 	unsigned long bar;
-	
+
 	print_debug("BAR 14 Dump\n");
-	
+
 	bar = pci_read_config32(dev, 0x14);
 	for(i = 0; i <= 0x300; i+=4) {
-#if 0		
+#if 0
 		unsigned char val;
 		if ((i & 0x0f) == 0) {
 			print_debug_hex8(i);
 			print_debug_char(':');
 		}
 		val = pci_read_config8(dev, i);
-#endif		
+#endif
 		if((i%4)==0) {
 		print_debug("\n");
 		print_debug_hex16(i);
@@ -191,8 +191,8 @@ static void dump_bar14(unsigned dev)
 static void dump_pci_devices(void)
 {
 	device_t dev;
-	for(dev = PCI_DEV(0, 0, 0); 
-		dev <= PCI_DEV(0, 0x1f, 0x7); 
+	for(dev = PCI_DEV(0, 0, 0);
+		dev <= PCI_DEV(0, 0x1f, 0x7);
 		dev += PCI_DEV(0,0,1)) {
 		uint32_t id;
 		id = pci_read_config32(dev, PCI_VENDOR_ID);
@@ -215,8 +215,8 @@ static void dump_spd_registers(const struct mem_controller *ctrl)
 		device = ctrl->channel0[i];
 		if (device) {
 			int j;
-			print_debug("dimm: "); 
-			print_debug_hex8(i); 
+			print_debug("dimm: ");
+			print_debug_hex8(i);
 			print_debug(".0: ");
 			print_debug_hex8(device);
 			for(j = 0; j < 256; j++) {
@@ -241,8 +241,8 @@ static void dump_spd_registers(const struct mem_controller *ctrl)
 		device = ctrl->channel1[i];
 		if (device) {
 			int j;
-			print_debug("dimm: "); 
-			print_debug_hex8(i); 
+			print_debug("dimm: ");
+			print_debug_hex8(i);
 			print_debug(".1: ");
 			print_debug_hex8(device);
 			for(j = 0; j < 256; j++) {
@@ -278,7 +278,7 @@ void dump_spd_registers(void)
         	print_debug("\n");
                 print_debug("dimm ");
 		print_debug_hex8(device);
-		
+
                 for(i = 0; (i < 256) ; i++) {
 	                unsigned char byte;
                         if ((i % 16) == 0) {
@@ -291,7 +291,7 @@ void dump_spd_registers(void)
 			         print_debug("bad device: ");
 				 print_debug_hex8(-status);
 				 print_debug("\n");
-			         break; 
+			         break;
 			}
 			print_debug_hex8(status);
 			print_debug_char(' ');
@@ -311,7 +311,7 @@ void dump_ipmi_registers(void)
         	print_debug("\n");
                 print_debug("ipmi ");
 		print_debug_hex8(device);
-		
+
                 for(i = 0; (i < 8) ; i++) {
 	                unsigned char byte;
 			status = smbus_read_byte(device, 2);
@@ -319,7 +319,7 @@ void dump_ipmi_registers(void)
 			         print_debug("bad device: ");
 				 print_debug_hex8(-status);
 				 print_debug("\n");
-			         break; 
+			         break;
 			}
 			print_debug_hex8(status);
 			print_debug_char(' ');
@@ -327,4 +327,4 @@ void dump_ipmi_registers(void)
 		device += SMBUS_MEM_DEVICE_INC;
 		print_debug("\n");
 	}
-}	
+}
diff --git a/src/mainboard/supermicro/x6dhr_ig/devicetree.cb b/src/mainboard/supermicro/x6dhr_ig/devicetree.cb
index 921c54fff5..b989e76e8a 100644
--- a/src/mainboard/supermicro/x6dhr_ig/devicetree.cb
+++ b/src/mainboard/supermicro/x6dhr_ig/devicetree.cb
@@ -1,21 +1,21 @@
 chip northbridge/intel/e7520 # mch
-	device pci_domain 0 on 
+	device pci_domain 0 on
 		chip southbridge/intel/i82801ex # i82801er
 			# USB ports
 			device pci 1d.0 on end
 			device pci 1d.1 on end
-			device pci 1d.2 on end 
+			device pci 1d.2 on end
 			device pci 1d.3 on end
 			device pci 1d.7 on end
-		
+
 			# -> VGA
 			device pci 1e.0 on end
-		
+
 			# -> IDE
-			device pci 1f.0 on 
+			device pci 1f.0 on
 				chip superio/winbond/w83627hf
 					device pnp 2e.0 off end
-					device pnp 2e.2 on 
+					device pnp 2e.2 on
 						 io 0x60 = 0x3f8
 						irq 0x70 = 4
 					end
@@ -39,18 +39,18 @@ chip northbridge/intel/e7520 # mch
 			register "pirq_a_d" = "0x0b070a05"
 			register "pirq_e_h" = "0x0a808080"
 		end
-		device pci 00.0 on end 
+		device pci 00.0 on end
 		device pci 00.1  on end
-		device pci 01.0 on end 
-		device pci 02.0 on end 
-		device pci 03.0 on 
+		device pci 01.0 on end
+		device pci 02.0 on end
+		device pci 03.0 on
 			chip southbridge/intel/pxhd # pxhd1
 				# Bus bridges and ioapics usually bus 2
 				device pci 0.0 on end
 				device pci 0.1 on end
-				device pci 0.2 on 
+				device pci 0.2 on
 				# On board gig e1000
-					chip drivers/generic/generic 
+					chip drivers/generic/generic
         		        	        device pci 02.0 on end
         		        	        device pci 02.1 on end
         		        	end
@@ -58,7 +58,7 @@ chip northbridge/intel/e7520 # mch
 				device pci 0.3 on end
 			end
 		end
-		device pci 04.0 on 
+		device pci 04.0 on
 			chip southbridge/intel/pxhd # pxhd2
 				# Bus bridges and ioapics usually bus 5
 				device pci 0.0 on end
diff --git a/src/mainboard/supermicro/x6dhr_ig/mptable.c b/src/mainboard/supermicro/x6dhr_ig/mptable.c
index b98ec52479..efc7abf22a 100644
--- a/src/mainboard/supermicro/x6dhr_ig/mptable.c
+++ b/src/mainboard/supermicro/x6dhr_ig/mptable.c
@@ -36,7 +36,7 @@ static void *smp_write_config_table(void *v)
 	mc->reserved = 0;
 
 	smp_write_processors(mc);
-	
+
 	{
 		device_t dev;
 
@@ -98,9 +98,9 @@ static void *smp_write_config_table(void *v)
 
 			bus_pxhd_4 = 7;
 		}
-	
+
 	}
-	
+
 	/* define bus and isa numbers */
 	for(bus_num = 0; bus_num < bus_isa; bus_num++) {
 		smp_write_bus(mc, bus_num, "PCI	  ");
@@ -159,7 +159,7 @@ static void *smp_write_config_table(void *v)
 		}
 	}
 
-	
+
 	/* ISA backward compatibility interrupts  */
 	smp_write_intsrc(mc, mp_ExtINT, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH,
 		bus_isa, 0x00, 0x02, 0x00);
diff --git a/src/mainboard/supermicro/x6dhr_ig/romstage.c b/src/mainboard/supermicro/x6dhr_ig/romstage.c
index 77c9eba0fb..16f0ac7337 100644
--- a/src/mainboard/supermicro/x6dhr_ig/romstage.c
+++ b/src/mainboard/supermicro/x6dhr_ig/romstage.c
@@ -54,8 +54,8 @@ static inline int spd_read_byte(unsigned device, unsigned address)
 static void main(unsigned long bist)
 {
 	/*
-	 * 
-	 * 
+	 *
+	 *
 	 */
 	static const struct mem_controller mch[] = {
 		{
@@ -117,7 +117,7 @@ static void main(unsigned long bist)
 #endif
 	disable_watchdogs();
 //	dump_ipmi_registers();
-	mainboard_set_e7520_leds();	
+	mainboard_set_e7520_leds();
 	sdram_initialize(ARRAY_SIZE(mch), mch);
 #if 1
 	dump_pci_devices();
@@ -127,7 +127,7 @@ static void main(unsigned long bist)
 	dump_bar14(PCI_DEV(0, 0x00, 0));
 #endif
 
-#if 0 // temporarily disabled 
+#if 0 // temporarily disabled
 	/* Check the first 1M */
 //	ram_check(0x00000000, 0x000100000);
 //	ram_check(0x00000000, 0x000a0000);
@@ -139,8 +139,8 @@ static void main(unsigned long bist)
 #if 0
 	ram_check(0x00000000, 0x02000000);
 #endif
-	
-#if 0	
+
+#if 0
 	while(1) {
 		hlt();
 	}
diff --git a/src/mainboard/supermicro/x6dhr_ig/watchdog.c b/src/mainboard/supermicro/x6dhr_ig/watchdog.c
index a4c1eec04f..44cfd10b73 100644
--- a/src/mainboard/supermicro/x6dhr_ig/watchdog.c
+++ b/src/mainboard/supermicro/x6dhr_ig/watchdog.c
@@ -31,17 +31,17 @@ static void disable_ich5_watchdog(void)
 	value = pci_read_config16(dev, 0x04);
 	value |= (1 << 10);
 	pci_write_config16(dev, 0x04, value);
-	
+
 	/* Set and enable acpibase */
 	pci_write_config32(dev, 0x40, ICH5_WDBASE | 1);
 	pci_write_config8(dev, 0x44, 0x10);
 	base = ICH5_WDBASE + 0x60;
-	
+
 	/* Set bit 11 in TCO1_CNT */
 	value = inw(base + 0x08);
 	value |= 1 << 11;
 	outw(value, base + 0x08);
-	
+
 	/* Clear TCO timeout status */
 	outw(0x0008, base + 0x04);
 	outw(0x0002, base + 0x06);
@@ -86,7 +86,7 @@ static void disable_jarell_frb3(void)
 	outl(value, base + 0x38);
 	value &= ~(1 << 16);
 	outl(value, base + 0x38);
-#endif				  
+#endif
 }
 
 static void disable_watchdogs(void)
diff --git a/src/mainboard/supermicro/x6dhr_ig/x6dhr_fixups.c b/src/mainboard/supermicro/x6dhr_ig/x6dhr_fixups.c
index 82c070b0c1..cc3e41eb9f 100644
--- a/src/mainboard/supermicro/x6dhr_ig/x6dhr_fixups.c
+++ b/src/mainboard/supermicro/x6dhr_ig/x6dhr_fixups.c
@@ -9,13 +9,13 @@ static void mch_reset(void)
 
 static void mainboard_set_e7520_pll(unsigned bits)
 {
-	return; 
+	return;
 }
 
 
 static void mainboard_set_e7520_leds(void)
 {
-	return; 
+	return;
 }