[POWERPC] modify PCI code for a merged kernel

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

1 files changed, 30 insertions, 28 deletions

diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index c1b1e14775e4..78d3c0fc8dfb 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -30,6 +30,7 @@
 #include <asm/byteorder.h>
 #include <asm/machdep.h>
 #include <asm/ppc-pci.h>
+#include <asm/firmware.h>
 
 #ifdef DEBUG
 #include <asm/udbg.h>
@@ -209,7 +210,6 @@ void pcibios_free_controller(struct pci_controller *phb)
                 kfree(phb);
 }
 
-#ifndef CONFIG_PPC_ISERIES
 void __devinit pcibios_claim_one_bus(struct pci_bus *b)
 {
         struct pci_dev *dev;
@@ -238,10 +238,12 @@ static void __init pcibios_claim_of_setup(void)
 {
         struct pci_bus *b;
 
+        if (firmware_has_feature(FW_FEATURE_ISERIES))
+                return;
+
         list_for_each_entry(b, &pci_root_buses, node)
                 pcibios_claim_one_bus(b);
 }
-#endif
 
 #ifdef CONFIG_PPC_MULTIPLATFORM
 static u32 get_int_prop(struct device_node *np, const char *name, u32 def)
@@ -554,9 +556,8 @@ static int __init pcibios_init(void)
          */
         ppc_md.phys_mem_access_prot = pci_phys_mem_access_prot;
 
-#ifdef CONFIG_PPC_ISERIES
-        iSeries_pcibios_init(); 
-#endif
+        if (firmware_has_feature(FW_FEATURE_ISERIES))
+                iSeries_pcibios_init();
 
         printk(KERN_DEBUG "PCI: Probing PCI hardware\n");
 
@@ -566,15 +567,15 @@ static int __init pcibios_init(void)
                 pci_bus_add_devices(hose->bus);
         }
 
-#ifndef CONFIG_PPC_ISERIES
-        if (pci_probe_only)
-                pcibios_claim_of_setup();
-        else
-                /* FIXME: `else' will be removed when
-                   pci_assign_unassigned_resources() is able to work
-                   correctly with [partially] allocated PCI tree. */
-                pci_assign_unassigned_resources();
-#endif /* !CONFIG_PPC_ISERIES */
+        if (!firmware_has_feature(FW_FEATURE_ISERIES)) {
+                if (pci_probe_only)
+                        pcibios_claim_of_setup();
+                else
+                        /* FIXME: `else' will be removed when
+                           pci_assign_unassigned_resources() is able to work
+                           correctly with [partially] allocated PCI tree. */
+                        pci_assign_unassigned_resources();
+        }
 
         /* Call machine dependent final fixup */
         if (ppc_md.pcibios_fixup)
@@ -586,8 +587,9 @@ static int __init pcibios_init(void)
                 printk(KERN_DEBUG "ISA bridge at %s\n", pci_name(ppc64_isabridge_dev));
 
 #ifdef CONFIG_PPC_MULTIPLATFORM
-        /* map in PCI I/O space */
-        phbs_remap_io();
+        if (!firmware_has_feature(FW_FEATURE_ISERIES))
+                /* map in PCI I/O space */
+                phbs_remap_io();
 #endif
 
         printk(KERN_DEBUG "PCI: Probing PCI hardware done\n");
@@ -637,13 +639,13 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
  */
 int pci_domain_nr(struct pci_bus *bus)
 {
-#ifdef CONFIG_PPC_ISERIES
-        return 0;
-#else
-        struct pci_controller *hose = pci_bus_to_host(bus);
+        if (firmware_has_feature(FW_FEATURE_ISERIES))
+                return 0;
+        else {
+                struct pci_controller *hose = pci_bus_to_host(bus);
 
-        return hose->global_number;
-#endif
+                return hose->global_number;
+        }
 }
 
 EXPORT_SYMBOL(pci_domain_nr);
@@ -651,12 +653,12 @@ EXPORT_SYMBOL(pci_domain_nr);
 /* Decide whether to display the domain number in /proc */
 int pci_proc_domain(struct pci_bus *bus)
 {
-#ifdef CONFIG_PPC_ISERIES
-        return 0;
-#else
-        struct pci_controller *hose = pci_bus_to_host(bus);
-        return hose->buid;
-#endif
+        if (firmware_has_feature(FW_FEATURE_ISERIES))
+                return 0;
+        else {
+                struct pci_controller *hose = pci_bus_to_host(bus);
+                return hose->buid;
+        }
 }
 
 /*