[POWERPC] iSeries: Call iSeries_pcibios_init from setup_arch

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

diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 9f63bdcb0bdf88f0cdabe6de30b8276070ecebaf..69364f3dc5c629163489bb3fc87cbf69769b6b70 100644 (file)
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -519,9 +519,6 @@ static int __init pcibios_init(void)
         */
        ppc_md.phys_mem_access_prot = pci_phys_mem_access_prot;
 
-       if (firmware_has_feature(FW_FEATURE_ISERIES))
-               iSeries_pcibios_init();
-
        printk(KERN_DEBUG "PCI: Probing PCI hardware\n");
 
        /* Scan all of the recorded PCI controllers.  */

diff --git a/arch/powerpc/platforms/iseries/pci.h b/arch/powerpc/platforms/iseries/pci.h
index 3af9cf1c1d040765e5a03c4578663b6dea4bbfc6..b14287342129616e800e0497b8a81f2917f55ce3 100644 (file)
--- a/arch/powerpc/platforms/iseries/pci.h
+++ b/arch/powerpc/platforms/iseries/pci.h
@@ -50,9 +50,11 @@ struct pci_dev;                              /* For Forward Reference */
 extern void    iSeries_Device_Information(struct pci_dev *PciDev, int count,
                        u16 bus, HvSubBusNumber subbus);
 #ifdef CONFIG_PCI
+extern void    iSeries_pcibios_init(void);
 extern void    iSeries_pci_final_fixup(void);
 #else
-static void    iSeries_pci_final_fixup(void) { }
+static inline void     iSeries_pcibios_init(void) { }
+static inline void     iSeries_pci_final_fixup(void) { }
 #endif
 
 #endif /* _PLATFORMS_ISERIES_PCI_H */

diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 2175a71800d56f1cc88c371f5933f9ab03918e19..5616219a20d5d3ee2d3f6484081378a19f1671ac 100644 (file)
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -495,6 +495,8 @@ static void __init iSeries_setup_arch(void)
                        itVpdAreas.xSlicMaxLogicalProcs);
        printk("Max physical processors = %d\n",
                        itVpdAreas.xSlicMaxPhysicalProcs);
+
+       iSeries_pcibios_init();
 }
 
 static void iSeries_show_cpuinfo(struct seq_file *m)

diff --git a/include/asm-powerpc/ppc-pci.h b/include/asm-powerpc/ppc-pci.h
index fda5e3d1f62a290959bd43774940714b34b31cbc..854ab713f56cb62b857216285d3b343c13e9ea66 100644 (file)
--- a/include/asm-powerpc/ppc-pci.h
+++ b/include/asm-powerpc/ppc-pci.h
@@ -46,9 +46,6 @@ extern void init_pci_config_tokens (void);
 extern unsigned long get_phb_buid (struct device_node *);
 extern int rtas_setup_phb(struct pci_controller *phb);
 
-/* From iSeries PCI */
-extern void iSeries_pcibios_init(void);
-
 extern unsigned long pci_probe_only;
 
 /* ---- EEH internal-use-only related routines ---- */