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

Commit 09b55f76 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Kumar Gala
Browse files

[POWERPC] rename add_bridge to avoid namespace clashes 



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: default avatarArnd Bergmann <arnd@arndb.de>
parent b9fd305d

arch/powerpc/platforms/82xx/mpc82xx_ads.c

+2 −2
Original line number Diff line number Diff line
@@ -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

arch/powerpc/platforms/83xx/mpc8313_rdb.c

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/powerpc/platforms/83xx/mpc832x_mds.c

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/powerpc/platforms/83xx/mpc832x_rdb.c

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/powerpc/platforms/83xx/mpc834x_itx.c

+1 −1
Original line number Diff line number Diff line
@@ -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