Changeset 1413 for trunk/board_enable.c

Timestamp:

Aug 15, 2011 9:54:20 PM (22 months ago)

Author:

hailfinger

Message:

Fixup of r1397:

• Mixing uninitialized and initialized local variables leads to confusion.
• ft2232_spi error cases should have gotten some error handling, and that's the reason the curly braces were there.
• Fixing typos/wording in some places would have been nice given that those places were touched anyway.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@…>
Acked-by: Stefan Tauner <stefan.tauner@…>

File:

• trunk/board_enable.c (modified) (3 diffs)

trunk/board_enable.c

@@ -861 +861 @@
         }
 
-        /* First, check the ISA bridge */
+        /* Check for the ISA bridge first. */
         dev = pci_dev_find_vendorclass(0x10DE, 0x0601);
         switch (dev->device_id) {
@@ -1130 +1130 @@
         uint32_t tmp, base;
 
-        /* GPPO {0,8,27,28,30} are always available */
-        static const uint32_t nonmuxed_gpos  = 0x58000101;
+        /* GPO{0,8,27,28,30} are always available. */
+        static const uint32_t nonmuxed_gpos = 0x58000101;
 
         static const struct {unsigned int reg, mask, value; } piix4_gpo[] = {
@@ -1180 +1180 @@
 
         if ((((1 << gpo) & nonmuxed_gpos) == 0) &&
-             (pci_read_word(dev, piix4_gpo[gpo].reg)
-             & piix4_gpo[gpo].mask) != piix4_gpo[gpo].value) {
-                msg_perr("\nERROR: PIIX4 GPO%d not programmed for output.\n",
-                         gpo);
+            ((pci_read_word(dev, piix4_gpo[gpo].reg) & piix4_gpo[gpo].mask) !=
+             piix4_gpo[gpo].value)) {
+                msg_perr("\nERROR: PIIX4 GPO%d not programmed for output.\n", gpo);
                 return -1;
         }