Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9623b5d3 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 9bd7ea60

arch/powerpc/kernel/pci_64.c

+3 −2
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ EXPORT_SYMBOL(io_page_mask); 
#ifdef CONFIG_PPC_MULTIPLATFORM

static void fixup_resource(struct resource *res, struct pci_dev *dev);

static void do_bus_setup(struct pci_bus *bus);

static void phbs_remap_io(void);

#endif



/* 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);

}



#ifndef CONFIG_PPC_ISERIES

void __devinit pcibios_claim_one_bus(struct pci_bus *b)

{

	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);

#endif



#ifndef CONFIG_PPC_ISERIES

static void __init pcibios_claim_of_setup(void)

{

	struct pci_bus *b;
@@ -1218,7 +1219,7 @@ int remap_bus_range(struct pci_bus *bus) 
}

EXPORT_SYMBOL(remap_bus_range);



void phbs_remap_io(void)

static void phbs_remap_io(void)

{

	struct pci_controller *hose, *tmp;

include/asm-powerpc/pci-bridge.h

+0 −2
Original line number Diff line number Diff line
@@ -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 void phbs_remap_io(void);



static inline struct pci_controller *pci_bus_to_host(struct pci_bus *bus)

{

	struct device_node *busdn = bus->sysdata;