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

[coreboot.git] / src / mainboard / olpc / btest / mainboard.c

diff --git a/src/mainboard/olpc/btest/mainboard.c b/src/mainboard/olpc/btest/mainboard.c
index 6df993eca41fec574330f759b722c5ec8229e46a..1e5add3dc04d60fc9049265d836ff23610dd75e4 100644 (file)
--- a/src/mainboard/olpc/btest/mainboard.c
+++ b/src/mainboard/olpc/btest/mainboard.c
@@ -61,7 +61,7 @@ static void init_dcon(void) {
        /* Enable the DCON */
        ret = do_smbus_write_word(iobase, 0x0D << 1, 0x01, 0x0069);
        if (ret != 0)
-               printk(BIOS_DEBUG, "DCON ENABLE FAILED\n", ret);
+               printk(BIOS_DEBUG, "DCON ENABLE FAILED %d\n", ret);
   }
   else
          printk(BIOS_DEBUG, "DCON NOT FOUND (%x)\n", rev);
@@ -69,30 +69,30 @@ static void init_dcon(void) {
   write_bit(rev > 0 ? 1 : 0);
 }
 
-void
+static void
 init_cafe_irq(void){
        const unsigned char slots_cafe[4] = {11, 0, 0, 0};
 
- 
-       /* CAFE PCI slots */ 
-       pci_assign_irqs(0, 0x0C, slots_cafe); 
-
-       /* Make the pin assignments - NOTENOTENOTE:  This should be 
-         * configurable! 
-         */ 
-
-       /* Configure the GPIO pins to use - class 0, index 9 to configure 
-         * AB.  Write 0xFF to disable 
-         */ 
-       
-       vrWrite(0x9, 0XFF00); 
-       
-       /* Configure the GPIO pins to use - class 0, index A to configure 
-         * CD.  Write 0xFF to disable 
-         */ 
-       
-       vrWrite(0xA, 0xFFFF); 
-        
+
+       /* CAFE PCI slots */
+       pci_assign_irqs(0, 0x0C, slots_cafe);
+
+       /* Make the pin assignments - NOTENOTENOTE:  This should be
+         * configurable!
+         */
+
+       /* Configure the GPIO pins to use - class 0, index 9 to configure
+         * AB.  Write 0xFF to disable
+         */
+
+       vrWrite(0x9, 0XFF00);
+
+       /* Configure the GPIO pins to use - class 0, index A to configure
+         * CD.  Write 0xFF to disable
+         */
+
+       vrWrite(0xA, 0xFFFF);
+
 }
 
 
@@ -111,7 +111,7 @@ static void init(struct device *dev) {
          * conditional we can make it a config variable later.
          */
 
-       printk(BIOS_DEBUG, "%s (%x,%x)SET USB PCI interrupt line to %d\n", 
+       printk(BIOS_DEBUG, "%s (%x,%x)SET USB PCI interrupt line to %d\n",
                __func__, bus, devfn, usbirq);
        usb = dev_find_slot(bus, devfn);
        if (! usb){