[POWERPC] Use for_each macros in arch/powerpc/sysdev (26cb7d8b) · Commits · 戴 / test

arch/powerpc/sysdev/fsl_soc.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -1128,12 +1128,11 @@ 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)
		for_each_compatible_node(np, "pcmcia", "fsl,pq-pcmcia")
		of_platform_device_create(np, "m8xx-pcmcia", NULL);
		return 0;
		}

+10 −14

Original line number	Diff line number	Diff line
		@@ -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:

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -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)

+4 −5

Original line number	Diff line number	Diff line
		@@ -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;
		}