lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] powerpc: small pci cleanups

Browse Source 
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>
This commit is contained in:
Stephen Rothwell
2006-01-12 14:18:28 +11:00
committed by Paul Mackerras
parent 9bd7ea60b1
commit 9623b5d3d3
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/kernel/pci_64.c
View File

@@ -53,6 +53,7 @@ EXPORT_SYMBOL(io_page_mask);
#ifdef CONFIG_PPC_MULTIPLATFORM #ifdef CONFIG_PPC_MULTIPLATFORM
static void fixup_resource(struct resource *res, struct pci_dev *dev); static void fixup_resource(struct resource *res, struct pci_dev *dev);
static void do_bus_setup(struct pci_bus *bus); static void do_bus_setup(struct pci_bus *bus);
static void phbs_remap_io(void);
#endif #endif
/* pci_io_base -- the base address from which io bars are offsets. /* pci_io_base -- the base address from which io bars are offsets.
@@ -251,6 +252,7 @@ void pcibios_free_controller(struct pci_controller *phb)
kfree(phb); kfree(phb);
} }
#ifndef CONFIG_PPC_ISERIES
void __devinit pcibios_claim_one_bus(struct pci_bus *b) void __devinit pcibios_claim_one_bus(struct pci_bus *b)
{ {
struct pci_dev *dev; struct pci_dev *dev;
@@ -275,7 +277,6 @@ void __devinit pcibios_claim_one_bus(struct pci_bus *b)
EXPORT_SYMBOL_GPL(pcibios_claim_one_bus); EXPORT_SYMBOL_GPL(pcibios_claim_one_bus);
#endif #endif
#ifndef CONFIG_PPC_ISERIES
static void __init pcibios_claim_of_setup(void) static void __init pcibios_claim_of_setup(void)
{ {
struct pci_bus *b; struct pci_bus *b;
@@ -1218,7 +1219,7 @@ int remap_bus_range(struct pci_bus *bus)
} }
EXPORT_SYMBOL(remap_bus_range); EXPORT_SYMBOL(remap_bus_range);
void phbs_remap_io(void) static void phbs_remap_io(void)
{ {
struct pci_controller *hose, *tmp; struct pci_controller *hose, *tmp;

2
include/asm-powerpc/pci-bridge.h
View File

@@ -142,8 +142,6 @@ void pcibios_fixup_new_pci_devices(struct pci_bus *bus, int fix_bus);
extern int pcibios_remove_root_bus(struct pci_controller *phb); extern int pcibios_remove_root_bus(struct pci_controller *phb);
extern void phbs_remap_io(void);
static inline struct pci_controller *pci_bus_to_host(struct pci_bus *bus) static inline struct pci_controller *pci_bus_to_host(struct pci_bus *bus)
{ {
struct device_node *busdn = bus->sysdata; struct device_node *busdn = bus->sysdata;