Commit 584351c3 authored by Christian Lamparter's avatar Christian Lamparter Committed by David S. Miller
Browse files

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: default avatarChristian Lamparter <chunkeey@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 867d1ac9

drivers/net/ethernet/ibm/emac/core.c

+5 −7
Original line number Diff line number Diff line
@@ -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)) {