diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-01-11 22:18:28 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-01-12 04:09:30 -0500 |
commit | 9623b5d3d3d85bac47a83e0e2cf2a9998ade9bd3 (patch) | |
tree | 7f93e9ef28b155020dc09de1b934cc989d4d48f8 /arch | |
parent | 9bd7ea60b1a0cf9fc745fd2eadb261e4c7719acd (diff) |
[PATCH] powerpc: small pci cleanups
pcibios_claim_one_bus is not needed on iSeries and phbs_remap_io can be
mode static.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/kernel/pci_64.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c index 24fe70f40b66..c367520bc1c3 100644 --- a/arch/powerpc/kernel/pci_64.c +++ b/arch/powerpc/kernel/pci_64.c | |||
@@ -53,6 +53,7 @@ EXPORT_SYMBOL(io_page_mask); | |||
53 | #ifdef CONFIG_PPC_MULTIPLATFORM | 53 | #ifdef CONFIG_PPC_MULTIPLATFORM |
54 | static void fixup_resource(struct resource *res, struct pci_dev *dev); | 54 | static void fixup_resource(struct resource *res, struct pci_dev *dev); |
55 | static void do_bus_setup(struct pci_bus *bus); | 55 | static void do_bus_setup(struct pci_bus *bus); |
56 | static void phbs_remap_io(void); | ||
56 | #endif | 57 | #endif |
57 | 58 | ||
58 | /* pci_io_base -- the base address from which io bars are offsets. | 59 | /* pci_io_base -- the base address from which io bars are offsets. |
@@ -251,6 +252,7 @@ void pcibios_free_controller(struct pci_controller *phb) | |||
251 | kfree(phb); | 252 | kfree(phb); |
252 | } | 253 | } |
253 | 254 | ||
255 | #ifndef CONFIG_PPC_ISERIES | ||
254 | void __devinit pcibios_claim_one_bus(struct pci_bus *b) | 256 | void __devinit pcibios_claim_one_bus(struct pci_bus *b) |
255 | { | 257 | { |
256 | struct pci_dev *dev; | 258 | struct pci_dev *dev; |
@@ -275,7 +277,6 @@ void __devinit pcibios_claim_one_bus(struct pci_bus *b) | |||
275 | EXPORT_SYMBOL_GPL(pcibios_claim_one_bus); | 277 | EXPORT_SYMBOL_GPL(pcibios_claim_one_bus); |
276 | #endif | 278 | #endif |
277 | 279 | ||
278 | #ifndef CONFIG_PPC_ISERIES | ||
279 | static void __init pcibios_claim_of_setup(void) | 280 | static void __init pcibios_claim_of_setup(void) |
280 | { | 281 | { |
281 | struct pci_bus *b; | 282 | struct pci_bus *b; |
@@ -1218,7 +1219,7 @@ int remap_bus_range(struct pci_bus *bus) | |||
1218 | } | 1219 | } |
1219 | EXPORT_SYMBOL(remap_bus_range); | 1220 | EXPORT_SYMBOL(remap_bus_range); |
1220 | 1221 | ||
1221 | void phbs_remap_io(void) | 1222 | static void phbs_remap_io(void) |
1222 | { | 1223 | { |
1223 | struct pci_controller *hose, *tmp; | 1224 | struct pci_controller *hose, *tmp; |
1224 | 1225 | ||