]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ucc_geth: use of_get_mac_address()
authorTimur Tabi <timur@freescale.com>
Wed, 21 Feb 2007 20:40:12 +0000 (14:40 -0600)
committerJeff Garzik <jeff@garzik.org>
Tue, 27 Feb 2007 09:21:25 +0000 (04:21 -0500)
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>
drivers/net/ucc_geth.c

index a2fc2bbcf97f71c623baab814250d61463d7a95a..885e73d731c220ef712847afc1ce15a1fcb0ac80 100644 (file)
@@ -4199,9 +4199,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
        ugeth->ug_info = ug_info;
        ugeth->dev = dev;
 
-       mac_addr = get_property(np, "mac-address", NULL);
-       if (mac_addr == NULL)
-               mac_addr = get_property(np, "local-mac-address", NULL);
+       mac_addr = of_get_mac_address(np);
        if (mac_addr)
                memcpy(dev->dev_addr, mac_addr, 6);