leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[POWERPC] rename add_bridge to avoid namespace clashes

Browse Source 
Many platforms currently define their own add_bridge function, some
of them globally. This breaks some multiplatform configurations.
Prefixing each of these functions with the platform name avoids
this problem.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2007-06-18 01:06:54 +02:00 committed by Kumar Gala
parent b9fd305db0
commit 09b55f76c9
21 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/platforms/82xx/mpc82xx_ads.c
View File

@ -515,7 +515,7 @@ static int m82xx_pci_exclude_device(u_char bus, u_char devfn)
return PCIBIOS_SUCCESSFUL;
}
void __init add_bridge(struct device_node *np)
static void __init mpc82xx_add_bridge(struct device_node *np)
{
int len;
struct pci_controller *hose;
@ -584,7 +584,7 @@ static void __init mpc82xx_ads_setup_arch(void)
#ifdef CONFIG_PCI
ppc_md.pci_exclude_device = m82xx_pci_exclude_device;
for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
add_bridge(np);
mpc82xx_add_bridge(np);
of_node_put(np);
#endif

2
arch/powerpc/platforms/83xx/mpc8313_rdb.c
View File

@ -49,7 +49,7 @@ static void __init mpc8313_rdb_setup_arch(void)
#ifdef CONFIG_PCI
for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
add_bridge(np);
mpc83xx_add_bridge(np);
ppc_md.pci_exclude_device = mpc83xx_exclude_device;
#endif

2
arch/powerpc/platforms/83xx/mpc832x_mds.c
View File

@ -80,7 +80,7 @@ static void __init mpc832x_sys_setup_arch(void)
#ifdef CONFIG_PCI
for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
add_bridge(np);
mpc83xx_add_bridge(np);
ppc_md.pci_exclude_device = mpc83xx_exclude_device;
#endif

2
arch/powerpc/platforms/83xx/mpc832x_rdb.c
View File

@ -53,7 +53,7 @@ static void __init mpc832x_rdb_setup_arch(void)
#ifdef CONFIG_PCI
for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
add_bridge(np);
mpc83xx_add_bridge(np);
ppc_md.pci_exclude_device = mpc83xx_exclude_device;
#endif

2
arch/powerpc/platforms/83xx/mpc834x_itx.c
View File

@ -59,7 +59,7 @@ static void __init mpc834x_itx_setup_arch(void)
#ifdef CONFIG_PCI
for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
add_bridge(np);
mpc83xx_add_bridge(np);
ppc_md.pci_exclude_device = mpc83xx_exclude_device;
#endif

2
arch/powerpc/platforms/83xx/mpc834x_mds.c
View File

@ -129,7 +129,7 @@ static void __init mpc834x_mds_setup_arch(void)
#ifdef CONFIG_PCI
for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
add_bridge(np);
mpc83xx_add_bridge(np);
ppc_md.pci_exclude_device = mpc83xx_exclude_device;
#endif

2
arch/powerpc/platforms/83xx/mpc836x_mds.c
View File

@ -86,7 +86,7 @@ static void __init mpc836x_mds_setup_arch(void)
#ifdef CONFIG_PCI
for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
add_bridge(np);
mpc83xx_add_bridge(np);
ppc_md.pci_exclude_device = mpc83xx_exclude_device;
#endif

2
arch/powerpc/platforms/83xx/mpc83xx.h
View File

@ -27,7 +27,7 @@
* mpc83xx_* files. Mostly for use by mpc83xx_setup
*/
extern int add_bridge(struct device_node *dev);
extern int mpc83xx_add_bridge(struct device_node *dev);
extern int mpc83xx_exclude_device(u_char bus, u_char devfn);
extern void mpc83xx_restart(char *cmd);
extern long mpc83xx_time_init(void);

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

@ -45,7 +45,7 @@ int mpc83xx_exclude_device(u_char bus, u_char devfn)
return PCIBIOS_SUCCESSFUL;
}
int __init add_bridge(struct device_node *dev)
int __init mpc83xx_add_bridge(struct device_node *dev)
{
int len;
struct pci_controller *hose;

2
arch/powerpc/platforms/85xx/mpc85xx.h
View File

@ -15,4 +15,4 @@
*/
extern void mpc85xx_restart(char *);
extern int add_bridge(struct device_node *dev);
extern int mpc85xx_add_bridge(struct device_node *dev);

2
arch/powerpc/platforms/85xx/mpc85xx_ads.c
View File

@ -241,7 +241,7 @@ static void __init mpc85xx_ads_setup_arch(void)
#ifdef CONFIG_PCI
for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
add_bridge(np);
mpc85xx_add_bridge(np);
ppc_md.pci_exclude_device = mpc85xx_exclude_device;
#endif
}

2
arch/powerpc/platforms/85xx/mpc85xx_cds.c
View File

@ -257,7 +257,7 @@ static void __init mpc85xx_cds_setup_arch(void)
#ifdef CONFIG_PCI
for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
add_bridge(np);
mpc85xx_add_bridge(np);
ppc_md.pcibios_fixup = mpc85xx_cds_pcibios_fixup;
ppc_md.pci_exclude_device = mpc85xx_exclude_device;

2
arch/powerpc/platforms/85xx/mpc85xx_mds.c
View File

@ -100,7 +100,7 @@ static void __init mpc85xx_mds_setup_arch(void)
#ifdef CONFIG_PCI
for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) {
add_bridge(np);
mpc85xx_add_bridge(np);
}
of_node_put(np);
#endif

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

@ -36,7 +36,7 @@
int mpc85xx_pci2_busno = 0;
#ifdef CONFIG_PCI
int __init add_bridge(struct device_node *dev)
int __init mpc85xx_add_bridge(struct device_node *dev)
{
int len;
struct pci_controller *hose;

2
arch/powerpc/platforms/86xx/mpc86xx.h
View File

@ -15,7 +15,7 @@
* mpc86xx_* files. Mostly for use by mpc86xx_setup().
*/
extern int add_bridge(struct device_node *dev);
extern int mpc86xx_add_bridge(struct device_node *dev);
extern int mpc86xx_exclude_device(u_char bus, u_char devfn);

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

@ -364,7 +364,7 @@ mpc86xx_hpcn_setup_arch(void)
#ifdef CONFIG_PCI
for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
add_bridge(np);
mpc86xx_add_bridge(np);
ppc_md.pci_exclude_device = mpc86xx_exclude_device;
#endif

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

@ -148,7 +148,7 @@ int mpc86xx_exclude_device(u_char bus, u_char devfn)
return PCIBIOS_SUCCESSFUL;
}
int __init add_bridge(struct device_node *dev)
int __init mpc86xx_add_bridge(struct device_node *dev)
{
int len;
struct pci_controller *hose;

4
arch/powerpc/platforms/embedded6xx/linkstation.c
View File

@ -54,7 +54,7 @@ static struct mtd_partition linkstation_physmap_partitions[] = {
},
};
static int __init add_bridge(struct device_node *dev)
static int __init linkstation_add_bridge(struct device_node *dev)
{
int len;
struct pci_controller *hose;
@ -92,7 +92,7 @@ static void __init linkstation_setup_arch(void)
/* Lookup PCI host bridges */
for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
add_bridge(np);
linkstation_add_bridge(np);
printk(KERN_INFO "BUFFALO Network Attached Storage Series\n");
printk(KERN_INFO "(C) 2002-2005 BUFFALO INC.\n");

6
arch/powerpc/platforms/maple/pci.c
View File

@ -444,7 +444,7 @@ static void __init setup_u3_ht(struct pci_controller* hose)
u3_ht = hose;
}
static int __init add_bridge(struct device_node *dev)
static int __init maple_add_bridge(struct device_node *dev)
{
int len;
struct pci_controller *hose;
@ -541,7 +541,7 @@ void __init maple_pci_init(void)
continue;
if ((of_device_is_compatible(np, "u4-pcie") ||
of_device_is_compatible(np, "u3-agp")) &&
add_bridge(np) == 0)
maple_add_bridge(np) == 0)
of_node_get(np);
if (of_device_is_compatible(np, "u3-ht")) {
@ -553,7 +553,7 @@ void __init maple_pci_init(void)
/* Now setup the HyperTransport host if we found any
*/
if (ht && add_bridge(ht) != 0)
if (ht && maple_add_bridge(ht) != 0)
of_node_put(ht);
/* Setup the linkage between OF nodes and PHBs */

4
arch/powerpc/platforms/pasemi/pci.c
View File

@ -132,7 +132,7 @@ static void __init setup_pa_pxp(struct pci_controller *hose)
hose->cfg_data = ioremap(0xe0000000, 0x10000000);
}
static int __init add_bridge(struct device_node *dev)
static int __init pas_add_bridge(struct device_node *dev)
{
struct pci_controller *hose;
@ -167,7 +167,7 @@ void __init pas_pci_init(void)
}
for (np = NULL; (np = of_get_next_child(root, np)) != NULL;)
if (np->name && !strcmp(np->name, "pxp") && !add_bridge(np))
if (np->name && !strcmp(np->name, "pxp") && !pas_add_bridge(np))
of_node_get(np);
of_node_put(root);

8
arch/powerpc/platforms/powermac/pci.c
View File

@ -35,8 +35,6 @@
#define DBG(x...)
#endif
static int add_bridge(struct device_node *dev);
/* XXX Could be per-controller, but I don't think we risk anything by
* assuming we won't have both UniNorth and Bandit */
static int has_uninorth;
@ -897,7 +895,7 @@ static void __init setup_u3_ht(struct pci_controller* hose)
* "pci" (a MPC106) and no bandit or chaos bridges, and contrariwise,
* if we have one or more bandit or chaos bridges, we don't have a MPC106.
*/
static int __init add_bridge(struct device_node *dev)
static int __init pmac_add_bridge(struct device_node *dev)
{
int len;
struct pci_controller *hose;
@ -1023,7 +1021,7 @@ void __init pmac_pci_init(void)
if (strcmp(np->name, "bandit") == 0
|| strcmp(np->name, "chaos") == 0
|| strcmp(np->name, "pci") == 0) {
if (add_bridge(np) == 0)
if (pmac_add_bridge(np) == 0)
of_node_get(np);
}
if (strcmp(np->name, "ht") == 0) {
@ -1037,7 +1035,7 @@ void __init pmac_pci_init(void)
/* Probe HT last as it relies on the agp resources to be already
* setup
*/
if (ht && add_bridge(ht) != 0)
if (ht && pmac_add_bridge(ht) != 0)
of_node_put(ht);
/* Setup the linkage between OF nodes and PHBs */