Skip to contentSkip to conversation

powerpc/sysdev: Fix a pci section mismatch for Book E

PATCH New Christian Engelmayer 1 participant 1 message Dec 15, 2013 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc/sysdev: Fix a pci section mismatch for Book E

Moved the following functions out of the __init section:

arch/powerpc/sysdev/fsl_pci.c : fsl_add_bridge()
arch/powerpc/sysdev/indirect_pci.c : setup_indirect_pci()

Those are referenced by arch/powerpc/sysdev/fsl_pci.c : fsl_pci_probe() when compiling for Book E support.

---
 arch/powerpc/sysdev/fsl_pci.c      | 2 +-
 arch/powerpc/sysdev/indirect_pci.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)
arch/powerpc/sysdev/fsl_pci.c +1 -1
index 4dfd61d..2b66425 100644
@@ -454,7 +454,7 @@ void fsl_pcibios_fixup_bus(struct pci_bus *bus)
 	}
 }
 
-int __init fsl_add_bridge(struct platform_device *pdev, int is_primary)
+int fsl_add_bridge(struct platform_device *pdev, int is_primary)
 {
 	int len;
 	struct pci_controller *hose;
arch/powerpc/sysdev/indirect_pci.c +2 -4
index c6c8b52..f434995 100644
@@ -152,10 +152,8 @@ static struct pci_ops indirect_pci_ops =
 	.write = indirect_write_config,
 };
 
-void __init
-setup_indirect_pci(struct pci_controller* hose,
-		   resource_size_t cfg_addr,
-		   resource_size_t cfg_data, u32 flags)
+void setup_indirect_pci(struct pci_controller *hose, resource_size_t cfg_addr,
+			resource_size_t cfg_data, u32 flags)
 {
 	resource_size_t base = cfg_addr & PAGE_MASK;
 	void __iomem *mbase;
Signature · 1 line
1.8.3.2