iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[POWERPC] Use for_each macros in arch/powerpc/sysdev

Browse Source 
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Cyrill Gorcunov 2007-11-30 06:44:36 +11:00 committed by Paul Mackerras
parent 283029d16a
commit 26cb7d8bbd
6 changed files with 25 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/powerpc/sysdev/fsl_soc.c
View File

@ -1128,13 +1128,12 @@ arch_initcall(fs_enet_of_init);
static int __init fsl_pcmcia_of_init(void)
{
struct device_node *np = NULL;
struct device_node *np;
/*
* Register all the devices which type is "pcmcia"
*/
while ((np = of_find_compatible_node(np,
"pcmcia", "fsl,pq-pcmcia")) != NULL)
of_platform_device_create(np, "m8xx-pcmcia", NULL);
for_each_compatible_node(np, "pcmcia", "fsl,pq-pcmcia")
of_platform_device_create(np, "m8xx-pcmcia", NULL);
return 0;
}

24
arch/powerpc/sysdev/mv64x60_dev.c
View File

@ -241,7 +241,7 @@ static int __init mv64x60_eth_device_setup(struct device_node *np, int id)
/* only register the shared platform device the first time through */
if (id == 0 && (err = eth_register_shared_pdev(np)))
return err;;
return err;
memset(r, 0, sizeof(r));
of_irq_to_resource(np, 0, &r[0]);
@ -451,22 +451,19 @@ static int __init mv64x60_device_setup(void)
int id;
int err;
for (id = 0;
(np = of_find_compatible_node(np, "serial", "marvell,mpsc")); id++)
if ((err = mv64x60_mpsc_device_setup(np, id)))
id = 0;
for_each_compatible_node(np, "serial", "marvell,mpsc")
if ((err = mv64x60_mpsc_device_setup(np, id++)))
goto error;
for (id = 0;
(np = of_find_compatible_node(np, "network",
"marvell,mv64x60-eth"));
id++)
if ((err = mv64x60_eth_device_setup(np, id)))
id = 0;
for_each_compatible_node(np, "network", "marvell,mv64x60-eth")
if ((err = mv64x60_eth_device_setup(np, id++)))
goto error;
for (id = 0;
(np = of_find_compatible_node(np, "i2c", "marvell,mv64x60-i2c"));
id++)
if ((err = mv64x60_i2c_device_setup(np, id)))
id = 0;
for_each_compatible_node(np, "i2c", "marvell,mv64x60-i2c")
if ((err = mv64x60_i2c_device_setup(np, id++)))
goto error;
/* support up to one watchdog timer */
@ -477,7 +474,6 @@ static int __init mv64x60_device_setup(void)
of_node_put(np);
}
return 0;
error:

4
arch/powerpc/sysdev/mv64x60_pci.c
View File

@ -164,8 +164,8 @@ static int __init mv64x60_add_bridge(struct device_node *dev)
void __init mv64x60_pci_init(void)
{
struct device_node *np = NULL;
struct device_node *np;
while ((np = of_find_compatible_node(np, "pci", "marvell,mv64x60-pci")))
for_each_compatible_node(np, "pci", "marvell,mv64x60-pci")
mv64x60_add_bridge(np);
}

4
arch/powerpc/sysdev/mv64x60_udbg.c
View File

@ -85,10 +85,10 @@ static void mv64x60_udbg_init(void)
if (!stdout)
return;
for (np = NULL;
(np = of_find_compatible_node(np, "serial", "marvell,mpsc")); )
for_each_compatible_node(np, "serial", "marvell,mpsc") {
if (np == stdout)
break;
}
of_node_put(stdout);
if (!np)

9
arch/powerpc/sysdev/tsi108_dev.c
View File

@ -66,14 +66,12 @@ EXPORT_SYMBOL(get_vir_csrbase);
static int __init tsi108_eth_of_init(void)
{
struct device_node *np;
unsigned int i;
unsigned int i = 0;
struct platform_device *tsi_eth_dev;
struct resource res;
int ret;
for (np = NULL, i = 0;
(np = of_find_compatible_node(np, "network", "tsi108-ethernet")) != NULL;
i++) {
for_each_compatible_node(np, "network", "tsi108-ethernet") {
struct resource r[2];
struct device_node *phy, *mdio;
hw_info tsi_eth_data;
@ -98,7 +96,7 @@ static int __init tsi108_eth_of_init(void)
__FUNCTION__,r[1].name, r[1].start, r[1].end);
tsi_eth_dev =
platform_device_register_simple("tsi-ethernet", i, &r[0],
platform_device_register_simple("tsi-ethernet", i++, &r[0],
1);
if (IS_ERR(tsi_eth_dev)) {
@ -154,6 +152,7 @@ static int __init tsi108_eth_of_init(void)
unreg:
platform_device_unregister(tsi_eth_dev);
err:
of_node_put(np);
return ret;
}

15
arch/powerpc/sysdev/uic.c
View File

@ -309,28 +309,23 @@ void __init uic_init_tree(void)
const u32 *interrupts;
/* First locate and initialize the top-level UIC */
np = of_find_compatible_node(NULL, NULL, "ibm,uic");
while (np) {
for_each_compatible_node(np, NULL, "ibm,uic") {
interrupts = of_get_property(np, "interrupts", NULL);
if (! interrupts)
if (!interrupts)
break;
np = of_find_compatible_node(np, NULL, "ibm,uic");
}
BUG_ON(!np); /* uic_init_tree() assumes there's a UIC as the
* top-level interrupt controller */
primary_uic = uic_init_one(np);
if (! primary_uic)
if (!primary_uic)
panic("Unable to initialize primary UIC %s\n", np->full_name);
irq_set_default_host(primary_uic->irqhost);
of_node_put(np);
/* The scan again for cascaded UICs */
np = of_find_compatible_node(NULL, NULL, "ibm,uic");
while (np) {
for_each_compatible_node(np, NULL, "ibm,uic") {
interrupts = of_get_property(np, "interrupts", NULL);
if (interrupts) {
/* Secondary UIC */
@ -348,8 +343,6 @@ void __init uic_init_tree(void)
/* FIXME: setup critical cascade?? */
}
np = of_find_compatible_node(np, NULL, "ibm,uic");
}
}