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

7 files changed, 70 insertions, 70 deletions

diff --git a/src/mainboard/dell/s1850/debug.c b/src/mainboard/dell/s1850/debug.c
index 2ea3db32ea..45315618b7 100644
--- a/src/mainboard/dell/s1850/debug.c
+++ b/src/mainboard/dell/s1850/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,7 +215,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) {
@@ -228,7 +228,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(' ');
@@ -248,7 +248,7 @@ void show_dram_slots(void)
 		print_debug("\n");
 		print_debug("dimm ");
 		print_debug_hex8(device);
-		
+
 		status = smbus_read_byte(device, 0);
 		if (status < 0) {
 			print_debug("bad device: ");
@@ -272,7 +272,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);
@@ -280,7 +280,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(' ');
@@ -288,4 +288,4 @@ void dump_ipmi_registers(void)
 		device += SMBUS_MEM_DEVICE_INC;
 		print_debug("\n");
 	}
-}	
+}
diff --git a/src/mainboard/dell/s1850/devicetree.cb b/src/mainboard/dell/s1850/devicetree.cb
index ab95e54a7b..bd7b3a3773 100644
--- a/src/mainboard/dell/s1850/devicetree.cb
+++ b/src/mainboard/dell/s1850/devicetree.cb
@@ -1,23 +1,23 @@
 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
-		
+
 			# -> Bridge
 			device pci 1e.0 on end
-		
+
 			# -> ISA
-			device pci 1f.0 on 
+			device pci 1f.0 on
 				chip superio/nsc/pc8374
 					device pnp 2e.0 off end
 					device pnp 2e.1 off end
 					device pnp 2e.2 off end
-					device pnp 2e.3 on 
+					device pnp 2e.3 on
 						 io 0x60 = 0x3f8
 						irq 0x70 = 4
 					end
@@ -30,22 +30,22 @@ chip northbridge/intel/e7520 # mch
 			end
 			# -> IDE
 			device pci 1f.1 on end
-			# -> SATA 
+			# -> SATA
 			device pci 1f.2 on end
 			device pci 1f.3 on end
 
 			register "pirq_a_d" = "0x8a07030b"
 			register "pirq_e_h" = "0x85808080"
 		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 
+		device pci 01.0 on end
+		device pci 02.0 on
 			chip southbridge/intel/pxhd # pxhd1
 				# Bus bridges and ioapics usually bus 1
-				device pci 0.0 on 
+				device pci 0.0 on
 				# On board gig e1000
-					chip drivers/generic/generic 
+					chip drivers/generic/generic
         		        	        device pci 03.0 on end
         		        	        device pci 03.1 on end
         		        	end
diff --git a/src/mainboard/dell/s1850/irq_tables.c b/src/mainboard/dell/s1850/irq_tables.c
index 8b4773df66..1f56ed30b9 100644
--- a/src/mainboard/dell/s1850/irq_tables.c
+++ b/src/mainboard/dell/s1850/irq_tables.c
@@ -1,8 +1,8 @@
 /*
  * This file is part of the coreboot project.
  *
- * Copyright (C) by the coreboot pirq tool. 
- * This file was programatically generated. 
+ * Copyright (C) by the coreboot pirq tool.
+ * This file was programatically generated.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/mainboard/dell/s1850/mptable.c b/src/mainboard/dell/s1850/mptable.c
index c7fd52af3e..4cdd0f1e7b 100644
--- a/src/mainboard/dell/s1850/mptable.c
+++ b/src/mainboard/dell/s1850/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 = 6;
 		}
-	
+
 	}
-	
+
 	/* define bus and isa numbers */
 	for(bus_num = 0; bus_num < bus_isa; bus_num++) {
 		smp_write_bus(mc, bus_num, "PCI	  ");
@@ -135,7 +135,7 @@ static void *smp_write_config_table(void *v)
 		else {
 			printk(BIOS_DEBUG, "ERROR - could not find IOAPIC PCI 1:00.3\n");
 		}
-	}	
+	}
 	/* 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/dell/s1850/romstage.c b/src/mainboard/dell/s1850/romstage.c
index 199c6ea5d5..07fbef282d 100644
--- a/src/mainboard/dell/s1850/romstage.c
+++ b/src/mainboard/dell/s1850/romstage.c
@@ -65,7 +65,7 @@ static inline int spd_read_byte(unsigned device, unsigned address)
 
 static inline void  ibfzero(void)
 {
-	while(inb(ipmicsr) &  (1<<IBF)) 
+	while(inb(ipmicsr) &  (1<<IBF))
 		;
 }
 static inline void  clearobf(void)
@@ -75,7 +75,7 @@ static inline void  clearobf(void)
 
 static inline void  waitobf(void)
 {
-	while((inb(ipmicsr) &  (1<<OBF)) == 0) 
+	while((inb(ipmicsr) &  (1<<OBF)) == 0)
 		;
 }
 /* quite possibly the stupidest interface ever designed. */
@@ -162,8 +162,8 @@ static void main(unsigned long bist)
 	u32 l;
 	int do_reset;
 	/*
-	 * 
-	 * 
+	 *
+	 *
 	 */
 	static const struct mem_controller mch[] = {
 		{
@@ -192,9 +192,9 @@ static void main(unsigned long bist)
 		0,
 	};
 
-	/* using SerialICE, we've seen this basic reset sequence on the dell. 
+	/* using SerialICE, we've seen this basic reset sequence on the dell.
 	 * we don't understand it as it uses undocumented registers, but
-	 * we're going to clone it. 
+	 * we're going to clone it.
 	 */
 	/* enable a hidden device. */
 	b = pci_read_config8(PCI_DEV(0, 0, 0), 0xf4);
@@ -217,11 +217,11 @@ static void main(unsigned long bist)
 	b = pci_read_config8(PCI_DEV(0, 0, 0), 0xf4);
 	b &= ~0x8;
 	pci_write_config8(PCI_DEV(0, 0, 0), 0xf4, b);
-	
+
 	/* set up LPC bridge bits, some of which reply on undocumented
 	 * registers
 	 */
-	
+
 	b= pci_read_config8(PCI_DEV(0, 0x1f, 0), 0xd8);
 	b |= 4;
 	pci_write_config8(PCI_DEV(0, 0x1f, 0), 0xd8, b);
@@ -244,9 +244,9 @@ static void main(unsigned long bist)
 	w = inw(0x866);
 	outw(w|2, 0x866);
 
-#if 0 
+#if 0
 	/*seriaice shows
-	dell does this so leave it here so I don't forget 
+	dell does this so leave it here so I don't forget
  	 */
 	/* SMBUS */
 	pci_write_config16(PCI_DEV(0, 0x1f, 3), 0x20, 0x08c0);
@@ -260,7 +260,7 @@ static void main(unsigned long bist)
 	b = pci_read_config8(PCI_DEV(0, 0, 0), 0xf4);
 	b |= 2;
 	pci_write_config8(PCI_DEV(0, 0, 0), 0xf4, b);
-	
+
 	/* ?? */
 	l = pci_read_config32(PCI_DEV(0, 8, 0), 0xc0);
 	do_reset = l & 0x8000000;
@@ -334,7 +334,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 0
@@ -345,7 +345,7 @@ static void main(unsigned long bist)
 //	dump_bar14(PCI_DEV(0, 0x00, 0));
 #endif
 
-#if 1 // temporarily disabled 
+#if 1 // temporarily disabled
 	/* Check the first 1M */
 //	ram_check(0x00000000, 0x000100000);
 //	ram_check(0x00000000, 0x000a0000);
@@ -357,8 +357,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/dell/s1850/s1850_fixups.c b/src/mainboard/dell/s1850/s1850_fixups.c
index 9827120056..7ef9ce163b 100644
--- a/src/mainboard/dell/s1850/s1850_fixups.c
+++ b/src/mainboard/dell/s1850/s1850_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;
 }
 
 static void mainboard_set_ich5(void)
@@ -28,8 +28,8 @@ static void mainboard_set_ich5(void)
 	pci_write_config8(PCI_DEV(0, 0x1f, 0), 0xe3, 0xc0);
 	pci_write_config8(PCI_DEV(0, 0x1f, 0), 0xf0, 0x0);
 	/* disable certain devices -- see data sheet -- this is from
-	 * dell settings via lspci 
-	 * Note that they leave SMBUS disabled -- 8f6f. 
+	 * dell settings via lspci
+	 * Note that they leave SMBUS disabled -- 8f6f.
 	 * we leave it enabled and visible in config space -- 8f66
 	 */
 	pci_write_config16(PCI_DEV(0, 0x1f, 0), 0xf2, 0x8f66);
@@ -38,7 +38,7 @@ static void mainboard_set_ich5(void)
 	pci_write_config8(PCI_DEV(0, 0x1f, 0), 0x5c, 0x10);
 
 	/* now the fun begins ... enable the GPIOs as done on factory */
-	/* factory config from IO ports 
+	/* factory config from IO ports
 	 * It has a few more things enabled than default!
 	 */
 	outl(0x1ae0f183, 0x880);
diff --git a/src/mainboard/dell/s1850/watchdog.c b/src/mainboard/dell/s1850/watchdog.c
index 50e9e6e7b0..43f4029b5e 100644
--- a/src/mainboard/dell/s1850/watchdog.c
+++ b/src/mainboard/dell/s1850/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);