diff options
author | Timur Tabi <timur@freescale.com> | 2007-02-21 15:40:12 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-02-27 04:21:25 -0500 |
commit | e9eb70c92143c8f03e456aa60d89204b3311e554 (patch) | |
tree | faffac60f29362b751c4633879bb58659bdfff96 /drivers | |
parent | f19841f517f4db628366fa2f080dfa7ac24f0f51 (diff) |
ucc_geth: use of_get_mac_address()
Update ucc_geth_probe() to use function of_get_mac_address() to obtain the MAC
address.
Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ucc_geth.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index a2fc2bbcf97f..885e73d731c2 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c | |||
@@ -4199,9 +4199,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma | |||
4199 | ugeth->ug_info = ug_info; | 4199 | ugeth->ug_info = ug_info; |
4200 | ugeth->dev = dev; | 4200 | ugeth->dev = dev; |
4201 | 4201 | ||
4202 | mac_addr = get_property(np, "mac-address", NULL); | 4202 | mac_addr = of_get_mac_address(np); |
4203 | if (mac_addr == NULL) | ||
4204 | mac_addr = get_property(np, "local-mac-address", NULL); | ||
4205 | if (mac_addr) | 4203 | if (mac_addr) |
4206 | memcpy(dev->dev_addr, mac_addr, 6); | 4204 | memcpy(dev->dev_addr, mac_addr, 6); |
4207 | 4205 | ||