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

Commit be63c09a authored by Josh Boyer's avatar Josh Boyer Committed by Jeff Garzik
Browse files

ibm_newemac Use status property for unused/unwired EMACs 



Convert ibm_newemac to use the of_device_is_available function when checking
for unused/unwired EMACs.  We leave the current check for an "unused" property
to maintain backwards compatibility for older device trees.  Newer device
trees should simply use the standard "status" property in the EMAC node.

Signed-off-by: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 51d4a1cc

drivers/net/ibm_newemac/core.c

+5 −2
Original line number Diff line number Diff line
@@ -2562,8 +2562,11 @@ static int __devinit emac_probe(struct of_device *ofdev, 
	struct device_node **blist = NULL;

	int err, i;



	/* Skip unused/unwired EMACS */

	if (of_get_property(np, "unused", NULL))

	/* Skip unused/unwired EMACS.  We leave the check for an unused

	 * property here for now, but new flat device trees should set a

	 * status property to "disabled" instead.

	 */

	if (of_get_property(np, "unused", NULL) || !of_device_is_available(np))

		return -ENODEV;



	/* Find ourselves in the bootlist if we are there */