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

Commit 3f8c5c3b authored by Josh Boyer's avatar Josh Boyer
Browse files

[POWERPC] 4xx: Use machine_device_initcall for bus probe 



Some machine_xx_initcall macros were recently added that check for the machine
type before calling the function.  This converts the 4xx platforms to use those
for bus probing.

Signed-off-by: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
parent 9e0fd5f0

arch/powerpc/platforms/40x/ep405.c

+1 −4
Original line number Diff line number Diff line
@@ -57,14 +57,11 @@ static __initdata struct of_device_id ep405_of_bus[] = { 


static int __init ep405_device_probe(void)

{

	if (!machine_is(ep405))

		return 0;



	of_platform_bus_probe(NULL, ep405_of_bus, NULL);



	return 0;

}

device_initcall(ep405_device_probe);

machine_device_initcall(ep405, ep405_device_probe);



static void __init ep405_init_bcsr(void)

{

arch/powerpc/platforms/40x/kilauea.c

+1 −4
Original line number Diff line number Diff line
@@ -30,14 +30,11 @@ static __initdata struct of_device_id kilauea_of_bus[] = { 


static int __init kilauea_device_probe(void)

{

	if (!machine_is(kilauea))

		return 0;



	of_platform_bus_probe(NULL, kilauea_of_bus, NULL);



	return 0;

}

device_initcall(kilauea_device_probe);

machine_device_initcall(kilauea, kilauea_device_probe);



static int __init kilauea_probe(void)

{

arch/powerpc/platforms/40x/makalu.c

+1 −4
Original line number Diff line number Diff line
@@ -30,14 +30,11 @@ static __initdata struct of_device_id makalu_of_bus[] = { 


static int __init makalu_device_probe(void)

{

	if (!machine_is(makalu))

		return 0;



	of_platform_bus_probe(NULL, makalu_of_bus, NULL);



	return 0;

}

device_initcall(makalu_device_probe);

machine_device_initcall(makalu, makalu_device_probe);



static int __init makalu_probe(void)

{

arch/powerpc/platforms/40x/virtex.c

+1 −4
Original line number Diff line number Diff line
@@ -17,14 +17,11 @@ 


static int __init virtex_device_probe(void)

{

	if (!machine_is(virtex))

		return 0;



	of_platform_bus_probe(NULL, NULL, NULL);



	return 0;

}

device_initcall(virtex_device_probe);

machine_device_initcall(virtex, virtex_device_probe);



static int __init virtex_probe(void)

{

arch/powerpc/platforms/40x/walnut.c

+1 −4
Original line number Diff line number Diff line
@@ -35,14 +35,11 @@ static __initdata struct of_device_id walnut_of_bus[] = { 


static int __init walnut_device_probe(void)

{

	if (!machine_is(walnut))

		return 0;



	of_platform_bus_probe(NULL, walnut_of_bus, NULL);



	return 0;

}

device_initcall(walnut_device_probe);

machine_device_initcall(walnut, walnut_device_probe);



static int __init walnut_probe(void)

{