Various Doxygen comment fixes, typo fixes, etc.

[coreboot.git] / src / devices / pcix_device.c

diff --git a/src/devices/pcix_device.c b/src/devices/pcix_device.c
index a1788920f9181e8802584c0bf89789d9fcf875c4..42babe79dda6c2215528dfeb0b0d9703864b6797 100644 (file)
--- a/src/devices/pcix_device.c
+++ b/src/devices/pcix_device.c
@@ -24,7 +24,6 @@
 #include <device/pci_ids.h>
 #include <device/pcix.h>
 
-
 static void pcix_tune_dev(device_t dev)
 {
        unsigned cap;
@@ -38,7 +37,7 @@ static void pcix_tune_dev(device_t dev)
        if (!cap) {
                return;
        }
-       printk_debug("%s PCI-X tuning\n", dev_path(dev));
+       printk(BIOS_DEBUG, "%s PCI-X tuning\n", dev_path(dev));
        status = pci_read_config32(dev, cap + PCI_X_STATUS);
        orig_cmd = cmd = pci_read_config16(dev,cap + PCI_X_CMD);
 
@@ -61,20 +60,11 @@ static void pcix_tune_dev(device_t dev)
        }
 }
 
-unsigned int pcix_scan_bus(struct bus *bus,
-       unsigned min_devfn, unsigned max_devfn, unsigned int max)
+static void pcix_tune_bus(struct bus *bus)
 {
        device_t child;
-       max = pci_scan_bus(bus, min_devfn, max_devfn, max);
-       for(child = bus->children; child; child = child->sibling) {
-               if (    (child->path.pci.devfn < min_devfn) ||
-                       (child->path.pci.devfn > max_devfn))
-               {
-                       continue;
-               }
+       for(child = bus->children; child; child = child->sibling)
                pcix_tune_dev(child);
-       }
-       return max;
 }
 
 const char *pcix_speed(unsigned sstatus)
@@ -86,12 +76,12 @@ const char *pcix_speed(unsigned sstatus)
        static const char pcix_266mhz[] = "266MHz PCI-X";
        static const char pcix_533mhz[] = "533MHZ PCI-X";
        static const char unknown[] = "Unknown";
-               
+
        const char *result;
        result = unknown;
        switch(PCI_X_SSTATUS_MFREQ(sstatus)) {
-       case PCI_X_SSTATUS_CONVENTIONAL_PCI:    
-               result = conventional; 
+       case PCI_X_SSTATUS_CONVENTIONAL_PCI:
+               result = conventional;
                break;
        case PCI_X_SSTATUS_MODE1_66MHZ:
                result = pcix_66mhz;
@@ -99,17 +89,17 @@ const char *pcix_speed(unsigned sstatus)
        case PCI_X_SSTATUS_MODE1_100MHZ:
                result = pcix_100mhz;
                break;
-               
+
        case PCI_X_SSTATUS_MODE1_133MHZ:
                result = pcix_133mhz;
                break;
-               
+
        case PCI_X_SSTATUS_MODE2_266MHZ_REF_66MHZ:
        case PCI_X_SSTATUS_MODE2_266MHZ_REF_100MHZ:
        case PCI_X_SSTATUS_MODE2_266MHZ_REF_133MHZ:
                result = pcix_266mhz;
                break;
-               
+
        case PCI_X_SSTATUS_MODE2_533MHZ_REF_66MHZ:
        case PCI_X_SSTATUS_MODE2_533MHZ_REF_100MHZ:
        case PCI_X_SSTATUS_MODE2_533MHZ_REF_133MHZ:
@@ -124,23 +114,21 @@ unsigned int pcix_scan_bridge(device_t dev, unsigned int max)
        unsigned pos;
        unsigned sstatus;
 
+       max = do_pci_scan_bridge(dev, max, pci_scan_bus);
        /* Find the PCI-X capability */
        pos = pci_find_capability(dev, PCI_CAP_ID_PCIX);
        sstatus = pci_read_config16(dev, pos + PCI_X_SEC_STATUS);
 
-       if (PCI_X_SSTATUS_MFREQ(sstatus) == PCI_X_SSTATUS_CONVENTIONAL_PCI) {
-               max = do_pci_scan_bridge(dev, max, pci_scan_bus);
-       } else {
-               max = do_pci_scan_bridge(dev, max, pcix_scan_bus);
+       if (PCI_X_SSTATUS_MFREQ(sstatus) != PCI_X_SSTATUS_CONVENTIONAL_PCI) {
+               pcix_tune_bus(dev->link_list);
        }
 
        /* Print the PCI-X bus speed */
-       printk_debug("PCI: %02x: %s\n", dev->link[0].secondary, pcix_speed(sstatus));
+       printk(BIOS_DEBUG, "PCI: %02x: %s\n", dev->link_list->secondary, pcix_speed(sstatus));
 
        return max;
 }
 
-
 /** Default device operations for PCI-X bridges */
 static struct pci_operations pcix_bus_ops_pci = {
        .set_subsystem = 0,