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

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
...@@ -2562,8 +2562,11 @@ static int __devinit emac_probe(struct of_device *ofdev, ...@@ -2562,8 +2562,11 @@ static int __devinit emac_probe(struct of_device *ofdev,
struct device_node **blist = NULL; struct device_node **blist = NULL;
int err, i; int err, i;
/* Skip unused/unwired EMACS */ /* Skip unused/unwired EMACS. We leave the check for an unused
if (of_get_property(np, "unused", NULL)) * 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; return -ENODEV;
/* Find ourselves in the bootlist if we are there */ /* Find ourselves in the bootlist if we are there */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment