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

[POWERPC] 82xx and embedded6xx: Use machine_*_initcall() hooks in platform code

Browse Source 
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Grant Likely
2008-01-24 22:23:24 -07:00
committed by Kumar Gala
parent b61ad6532b
commit ca956f0ea8
3 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/platforms/82xx/mpc8272_ads.c
View File

@@ -165,14 +165,11 @@ static struct of_device_id __initdata of_bus_ids[] = {
static int __init declare_of_platform_devices(void) static int __init declare_of_platform_devices(void)
{ {
if (!machine_is(mpc8272_ads))
return 0;
/* Publish the QE devices */ /* Publish the QE devices */
of_platform_bus_probe(NULL, of_bus_ids, NULL); of_platform_bus_probe(NULL, of_bus_ids, NULL);
return 0; return 0;
} }
device_initcall(declare_of_platform_devices); machine_device_initcall(mpc8272_ads, declare_of_platform_devices);
/* /*
* Called very early, device-tree isn't unflattened * Called very early, device-tree isn't unflattened

5
arch/powerpc/platforms/82xx/pq2fads.c
View File

@@ -176,14 +176,11 @@ static struct of_device_id __initdata of_bus_ids[] = {
static int __init declare_of_platform_devices(void) static int __init declare_of_platform_devices(void)
{ {
if (!machine_is(pq2fads))
return 0;
/* Publish the QE devices */ /* Publish the QE devices */
of_platform_bus_probe(NULL, of_bus_ids, NULL); of_platform_bus_probe(NULL, of_bus_ids, NULL);
return 0; return 0;
} }
device_initcall(declare_of_platform_devices); machine_device_initcall(pq2fads, declare_of_platform_devices);
define_machine(pq2fads) define_machine(pq2fads)
{ {

5
arch/powerpc/platforms/embedded6xx/ls_uart.c
View File

@@ -117,9 +117,6 @@ static int __init ls_uarts_init(void)
phys_addr_t phys_addr; phys_addr_t phys_addr;
int len; int len;
if (!machine_is(linkstation))
return 0;
avr = of_find_node_by_path("/soc10x/serial@80004500"); avr = of_find_node_by_path("/soc10x/serial@80004500");
if (!avr) if (!avr)
return -EINVAL; return -EINVAL;
@@ -142,4 +139,4 @@ static int __init ls_uarts_init(void)
return 0; return 0;
} }
late_initcall(ls_uarts_init); machine_late_initcall(linkstation, ls_uarts_init);