net: ethernet: emac: utilize of_net's of_get_mac_address()

of_get_mac_address() reads the same "local-mac-address" property.
... But goes above and beyond by checking the MAC value properly.

printk+message seems outdated too,
so let's put dev_err in the queue.

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c
index 664a91af662df85057456d076e032d739315a3ed..523c488c71f65fb75cf03d38166217f996666400 100644 (file)
--- a/drivers/net/ethernet/ibm/emac/core.c
+++ b/drivers/net/ethernet/ibm/emac/core.c
@@ -2848,7 +2848,6 @@ static int emac_init_phy(struct emac_instance *dev)
 static int emac_init_config(struct emac_instance *dev)
 {
        struct device_node *np = dev->ofdev->dev.of_node;
-       const void *p;
        int err;
 
        /* Read config from device-tree */
@@ -2976,13 +2975,12 @@ static int emac_init_config(struct emac_instance *dev)
        }
 
        /* Read MAC-address */
-       p = of_get_property(np, "local-mac-address", NULL);
-       if (p == NULL) {
-               printk(KERN_ERR "%pOF: Can't find local-mac-address property\n",
-                      np);
-               return -ENXIO;
+       err = of_get_mac_address(np, dev->ndev->dev_addr);
+       if (err) {
+               if (err != -EPROBE_DEFER)
+                       dev_err(&dev->ofdev->dev, "Can't get valid [local-]mac-address from OF !\n");
+               return err;
        }
-       memcpy(dev->ndev->dev_addr, p, ETH_ALEN);
 
        /* IAHT and GAHT filter parameterization */
        if (emac_has_feature(dev, EMAC_FTR_EMAC4SYNC)) {