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

[POWERPC] Move pci_bus_to_hose users to pci_bus_to_host

Browse Source 
In the places we can move to using pci_bus_to_host, this allows us
to make pci_bus_to_host static and remove its export.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Kumar Gala
2007-06-27 10:27:33 -05:00
parent dbf8471f52
commit 0b1d40c4d4
4 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/powerpc/kernel/pci_32.c
View File

@@ -766,7 +766,7 @@ static struct device_node *scan_OF_for_pci_bus(struct pci_bus *bus)
/* Are we a root bus ? */ /* Are we a root bus ? */
if (bus->self == NULL || bus->parent == NULL) { if (bus->self == NULL || bus->parent == NULL) {
struct pci_controller *hose = pci_bus_to_hose(bus->number); struct pci_controller *hose = pci_bus_to_host(bus);
if (hose == NULL) if (hose == NULL)
return NULL; return NULL;
return of_node_get(hose->arch_data); return of_node_get(hose->arch_data);
@@ -1492,7 +1492,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
return 0; return 0;
} }
struct pci_controller* static struct pci_controller*
pci_bus_to_hose(int bus) pci_bus_to_hose(int bus)
{ {
struct pci_controller* hose = hose_head; struct pci_controller* hose = hose_head;
@@ -1507,7 +1507,7 @@ static struct resource *__pci_mmap_make_offset(struct pci_dev *dev,
resource_size_t *offset, resource_size_t *offset,
enum pci_mmap_state mmap_state) enum pci_mmap_state mmap_state)
{ {
struct pci_controller *hose = pci_bus_to_hose(dev->bus->number); struct pci_controller *hose = pci_bus_to_host(dev->bus);
unsigned long io_offset = 0; unsigned long io_offset = 0;
int i, res_bit; int i, res_bit;
@@ -1719,7 +1719,7 @@ void pci_resource_to_user(const struct pci_dev *dev, int bar,
const struct resource *rsrc, const struct resource *rsrc,
resource_size_t *start, resource_size_t *end) resource_size_t *start, resource_size_t *end)
{ {
struct pci_controller *hose = pci_bus_to_hose(dev->bus->number); struct pci_controller *hose = pci_bus_to_host(dev->bus);
resource_size_t offset = 0; resource_size_t offset = 0;
if (hose == NULL) if (hose == NULL)

1
arch/powerpc/kernel/ppc_ksyms.c
View File

@@ -106,7 +106,6 @@ EXPORT_SYMBOL(isa_mem_base);
EXPORT_SYMBOL(pci_dram_offset); EXPORT_SYMBOL(pci_dram_offset);
EXPORT_SYMBOL(pci_alloc_consistent); EXPORT_SYMBOL(pci_alloc_consistent);
EXPORT_SYMBOL(pci_free_consistent); EXPORT_SYMBOL(pci_free_consistent);
EXPORT_SYMBOL(pci_bus_to_hose);
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
EXPORT_SYMBOL(start_thread); EXPORT_SYMBOL(start_thread);

2
arch/powerpc/platforms/86xx/pci.c
View File

@@ -145,7 +145,7 @@ static void __devinit quirk_fsl_pcie_transparent(struct pci_dev *dev)
*/ */
dev->transparent = 1; dev->transparent = 1;
hose = pci_bus_to_hose(dev->bus->number); hose = pci_bus_to_host(dev->bus);
if (!hose) { if (!hose) {
printk(KERN_ERR "Can't find hose for bus %d\n", printk(KERN_ERR "Can't find hose for bus %d\n",
dev->bus->number); dev->bus->number);

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

@@ -9,9 +9,6 @@
struct device_node; struct device_node;
struct pci_controller; struct pci_controller;
/* Get the PCI host controller for a bus */
extern struct pci_controller* pci_bus_to_hose(int bus);
/* /*
* Structure of a PCI controller (host bridge) * Structure of a PCI controller (host bridge)
*/ */