iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: ethoc: Utilize of_get_mac_address()

Browse Source 
Do not open code getting the MAC address exclusively from the
"local-mac-address" property, but instead use of_get_mac_address() which
looks up the MAC address using the 3 typical property names.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Tobias Klauser <tklauser@distanz.ch>
Acked-by: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Fainelli 2016-12-04 12:40:29 -08:00 committed by David S. Miller
parent abf7e53e9e
commit b34296a9c0
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/ethernet/ethoc.c
View File

@ -23,6 +23,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_net.h>
#include <linux/module.h> #include <linux/module.h>
#include <net/ethoc.h> #include <net/ethoc.h>
@ -1158,11 +1159,9 @@ static int ethoc_probe(struct platform_device *pdev)
memcpy(netdev->dev_addr, pdata->hwaddr, IFHWADDRLEN); memcpy(netdev->dev_addr, pdata->hwaddr, IFHWADDRLEN);
priv->phy_id = pdata->phy_id; priv->phy_id = pdata->phy_id;
} else { } else {
const uint8_t *mac; const void *mac;
mac = of_get_property(pdev->dev.of_node, mac = of_get_mac_address(pdev->dev.of_node);
"local-mac-address",
NULL);
if (mac) if (mac)
memcpy(netdev->dev_addr, mac, IFHWADDRLEN); memcpy(netdev->dev_addr, mac, IFHWADDRLEN);
priv->phy_id = -1; priv->phy_id = -1;