[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>

6 files changed, 38 insertions, 27 deletions

diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 38cd30cb7c75..5248670d29f7 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -2880,17 +2880,20 @@ static int __devinit gem_get_device_address(struct gem *gp)
 #if defined(__sparc__)
         struct pci_dev *pdev = gp->pdev;
         struct pcidev_cookie *pcp = pdev->sysdata;
-        int node = -1;
+        int use_idprom = 1;
 
         if (pcp != NULL) {
-                node = pcp->prom_node;
-                if (prom_getproplen(node, "local-mac-address") == 6)
-                        prom_getproperty(node, "local-mac-address",
-                                         dev->dev_addr, 6);
-                else
-                        node = -1;
+                unsigned char *addr;
+                int len;
+
+                addr = of_get_property(pcp->prom_node, "local-mac-address",
+                                       &len);
+                if (addr && len == 6) {
+                        use_idprom = 0;
+                        memcpy(dev->dev_addr, addr, 6);
+                }
         }
-        if (node == -1)
+        if (use_idprom)
                 memcpy(dev->dev_addr, idprom->id_ethaddr, 6);
 #elif defined(CONFIG_PPC_PMAC)
         unsigned char *addr;
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index bd5d2668a362..b0d452733c9b 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -3013,7 +3013,6 @@ static int __init happy_meal_pci_init(struct pci_dev *pdev)
         struct quattro *qp = NULL;
 #ifdef __sparc__
         struct pcidev_cookie *pcp;
-        int node;
 #endif
         struct happy_meal *hp;
         struct net_device *dev;
@@ -3026,13 +3025,12 @@ static int __init happy_meal_pci_init(struct pci_dev *pdev)
         /* Now make sure pci_dev cookie is there. */
 #ifdef __sparc__
         pcp = pdev->sysdata;
-        if (pcp == NULL || pcp->prom_node == -1) {
+        if (pcp == NULL) {
                 printk(KERN_ERR "happymeal(PCI): Some PCI device info missing\n");
                 return -ENODEV;
         }
-        node = pcp->prom_node;
         
-        prom_getstring(node, "name", prom_name, sizeof(prom_name));
+        strcpy(prom_name, pcp->prom_node->name);
 #else
         if (is_quattro_p(pdev))
                 strcpy(prom_name, "SUNW,qfe");
@@ -3104,10 +3102,14 @@ static int __init happy_meal_pci_init(struct pci_dev *pdev)
                 macaddr[5]++;
         } else {
 #ifdef __sparc__
+                unsigned char *addr;
+                int len;
+
                 if (qfe_slot != -1 &&
-                    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)) != NULL
+                    && len == 6) {
+                        memcpy(dev->dev_addr, addr, 6);
                 } else {
                         memcpy(dev->dev_addr, idprom->id_ethaddr, 6);
                 }
@@ -3124,7 +3126,7 @@ static int __init happy_meal_pci_init(struct pci_dev *pdev)
         hp->tcvregs    = (hpreg_base + 0x7000UL);
 
 #ifdef __sparc__
-        hp->hm_revision = prom_getintdefault(node, "hm-rev", 0xff);
+        hp->hm_revision = of_getintprop_default(pcp->prom_node, "hm-rev", 0xff);
         if (hp->hm_revision == 0xff) {
                 unsigned char prev;
 
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;
                 }
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index cabdf894e21e..e0de66739a42 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -1550,10 +1550,14 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
                         dev->dev_addr[i] = last_phys_addr[i];
                 dev->dev_addr[i] = last_phys_addr[i] + 1;
 #if defined(__sparc__)
-                if ((pcp != NULL) && prom_getproplen(pcp->prom_node,
-                        "local-mac-address") == 6) {
-                        prom_getproperty(pcp->prom_node, "local-mac-address",
-                            dev->dev_addr, 6);
+                if (pcp) {
+                        unsigned char *addr;
+                        int len;
+                  
+                        addr = of_get_property(pcp->prom_node,
+                                               "local-mac-address", &len);
+                        if (addr && len == 6)
+                                memcpy(dev->dev_addr, addr, 6);
                 }
 #endif
 #if defined(__i386__) || defined(__x86_64__)    /* Patch up x86 BIOS bug. */
diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c
index 239e108b8ed1..cf5b476b5496 100644
--- a/drivers/sbus/char/openprom.c
+++ b/drivers/sbus/char/openprom.c
@@ -243,8 +243,8 @@ static int openprom_sunos_ioctl(struct inode * inode, struct file * file,
                                               ((int *) opp->oprom_array)[1]);
 
                         pcp = pdev->sysdata;
-                        if (pcp != NULL && pcp->prom_node != -1 && pcp->prom_node) {
-                                node = pcp->prom_node;
+                        if (pcp != NULL) {
+                                node = pcp->prom_node->node;
                                 data->current_node = node;
                                 *((int *)opp->oprom_array) = node;
                                 opp->oprom_size = sizeof(int);
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index eb6aa42be60e..c054bb28b1c4 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -2966,7 +2966,7 @@ static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
         }
 
         pcp = pdev->sysdata;
-        if (node == pcp->prom_node) {
+        if (node == pcp->prom_node->node) {
                 struct fb_var_screeninfo *var = &default_var;
                 unsigned int N, P, Q, M, T, R;
                 u32 v_total, h_total;