Big white-space cleanup.

[platform/kernel/u-boot.git] / drivers / pci / pci.c

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 7944b66..b3ae3b1 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -38,8 +38,8 @@
 #include <pci.h>
 
 #define PCI_HOSE_OP(rw, size, type)                                    \
-int pci_hose_##rw##_config_##size(struct pci_controller *hose,                 \
-                                 pci_dev_t dev,                        \
+int pci_hose_##rw##_config_##size(struct pci_controller *hose,         \
+                                 pci_dev_t dev,                        \
                                  int offset, type value)               \
 {                                                                      \
        return hose->rw##_##size(hose, dev, offset, value);             \
@@ -77,7 +77,7 @@ PCI_OP(write, dword, u32, )
 
 #define PCI_READ_VIA_DWORD_OP(size, type, off_mask)                    \
 int pci_hose_read_config_##size##_via_dword(struct pci_controller *hose,\
-                                       pci_dev_t dev,                  \
+                                       pci_dev_t dev,                  \
                                        int offset, type val)           \
 {                                                                      \
        u32 val32;                                                      \
@@ -94,7 +94,7 @@ int pci_hose_read_config_##size##_via_dword(struct pci_controller *hose,\
 
 #define PCI_WRITE_VIA_DWORD_OP(size, type, off_mask, val_mask)         \
 int pci_hose_write_config_##size##_via_dword(struct pci_controller *hose,\
-                                            pci_dev_t dev,             \
+                                            pci_dev_t dev,             \
                                             int offset, type val)      \
 {                                                                      \
        u32 val32, mask, ldata, shift;                                  \
@@ -221,7 +221,7 @@ pci_dev_t pci_find_device(unsigned int vendor, unsigned int device, int index)
  */
 
 unsigned long pci_hose_phys_to_bus (struct pci_controller *hose,
-                                   unsigned long phys_addr,
+                                   phys_addr_t phys_addr,
                                    unsigned long flags)
 {
        struct pci_region *res;
@@ -253,9 +253,9 @@ Done:
        return 0;
 }
 
-unsigned long pci_hose_bus_to_phys(struct pci_controller* hose,
-                                  unsigned long bus_addr,
-                                  unsigned long flags)
+phys_addr_t pci_hose_bus_to_phys(struct pci_controller* hose,
+                                unsigned long bus_addr,
+                                unsigned long flags)
 {
        struct pci_region *res;
        int i;
@@ -425,9 +425,6 @@ int pci_hose_scan_bus(struct pci_controller *hose, int bus)
             dev <  PCI_BDF(bus,PCI_MAX_PCI_DEVICES-1,PCI_MAX_PCI_FUNCTIONS-1);
             dev += PCI_BDF(0,0,1))
        {
-
-       /* Bus 0 is not necessarily PCI bridge. */
-#if defined(CONFIG_PCI_SKIP_HOST_BRIDGE)
                /* Skip our host bridge */
                if ( dev == PCI_BDF(hose->first_busno,0,0) ) {
 #if defined(CONFIG_PCI_CONFIG_HOST_BRIDGE)              /* don't skip host bridge */
@@ -437,11 +434,10 @@ int pci_hose_scan_bus(struct pci_controller *hose, int bus)
                        if (getenv("pciconfighost") == NULL) {
                                continue; /* Skip our host bridge */
                        }
-#else /* CONFIG_PCI_CONFIG_HOST_BRIDGE */
+#else
                        continue; /* Skip our host bridge */
-#endif /* CONFIG_PCI_CONFIG_HOST_BRIDGE */
+#endif
                }
-#endif /* CONFIG_PCI_SKIP_HOST_BRIDGE */
 
                if (PCI_FUNC(dev) && !found_multi)
                        continue;
@@ -477,11 +473,8 @@ int pci_hose_scan_bus(struct pci_controller *hose, int bus)
                                hose->fixup_irq(hose, dev);
 
 #ifdef CONFIG_PCI_SCAN_SHOW
-#if defined(CONFIG_PCI_SKIP_HOST_BRIDGE)
                        /* Skip our host bridge */
-                       if ( dev != PCI_BDF(hose->first_busno,0,0) )
-#endif
-                       {
+                       if ( dev != PCI_BDF(hose->first_busno,0,0) ) {
                            unsigned char int_line;
 
                            pci_hose_read_config_byte(hose, dev, PCI_INTERRUPT_LINE,