[SPARC64]: Convert sparc64 PCI layer to in-kernel device tree.

One thing this change pointed out was that we really should
pull the "get 'local-mac-address' property" logic into a helper
function all the network drivers can call.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index e3e380f90f86..35f931638750 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -10549,11 +10549,13 @@ static int __devinit tg3_get_macaddr_sparc(struct tg3 *tp)
         struct pcidev_cookie *pcp = pdev->sysdata;
 
         if (pcp != NULL) {
-                int node = pcp->prom_node;
+                unsigned char *addr;
+                int len;
 
-                if (prom_getproplen(node, "local-mac-address") == 6) {
-                        prom_getproperty(node, "local-mac-address",
-                                         dev->dev_addr, 6);
+                addr = of_get_property(pcp->prom_node, "local-mac-address",
+                                        &len);
+                if (addr && len == 6) {
+                        memcpy(dev->dev_addr, addr, 6);
                         memcpy(dev->perm_addr, dev->dev_addr, 6);
                         return 0;
                 }