diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-17 17:59:00 +0300 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-17 17:59:00 +0300 |
| commit | 6624b35d6250632497c5943faa2ee2a91344d91c (patch) | |
| tree | f58947a6fd0698ce4626be2a4125e149ea6370ef /arch/powerpc/sysdev/fsl_soc.c | |
| parent | d71a1dc62b0380ab9c4022dcba02775a791c3d7e (diff) | |
| parent | fc7900bb04c4290f3a8e43abf231aee566feff6d (diff) | |
| download | linux-6624b35d6250632497c5943faa2ee2a91344d91c.tar.xz | |
Merge branch 'master' into 83xx
Diffstat (limited to 'arch/powerpc/sysdev/fsl_soc.c')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_soc.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c index 34161bc5a02f..d20f02927f72 100644 --- a/arch/powerpc/sysdev/fsl_soc.c +++ b/arch/powerpc/sysdev/fsl_soc.c @@ -233,14 +233,7 @@ static int __init gfar_of_init(void) goto err; } - mac_addr = get_property(np, "local-mac-address", NULL); - if (mac_addr == NULL) - mac_addr = get_property(np, "mac-address", NULL); - if (mac_addr == NULL) { - /* Obsolete */ - mac_addr = get_property(np, "address", NULL); - } - + mac_addr = of_get_mac_address(np); if (mac_addr) memcpy(gfar_data.mac_addr, mac_addr, 6); @@ -646,8 +639,9 @@ static int __init fs_enet_of_init(void) goto unreg; } - mac_addr = get_property(np, "mac-address", NULL); - memcpy(fs_enet_data.macaddr, mac_addr, 6); + mac_addr = of_get_mac_address(np); + if (mac_addr) + memcpy(fs_enet_data.macaddr, mac_addr, 6); ph = get_property(np, "phy-handle", NULL); phy = of_find_node_by_phandle(*ph); @@ -931,8 +925,9 @@ static int __init fs_enet_of_init(void) goto err; r[0].name = enet_regs; - mac_addr = (void *)get_property(np, "mac-address", NULL); - memcpy(fs_enet_data.macaddr, mac_addr, 6); + mac_addr = of_get_mac_address(np); + if (mac_addr) + memcpy(fs_enet_data.macaddr, mac_addr, 6); ph = (phandle *) get_property(np, "phy-handle", NULL); if (ph != NULL) |