net/smscx5xx: change to of_get_mac_address() eth_platform_get_mac_address()

Use more generic eth_platform_get_mac_address() which can get a MAC
address from other than DT platform specific sources too. Check if the
obtained address is valid.

Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c
index 9556d43..8689835 100644 (file)
--- a/drivers/net/usb/smsc75xx.c
+++ b/drivers/net/usb/smsc75xx.c
@@ -757,13 +757,14 @@ static int smsc75xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
 
 static void smsc75xx_init_mac_address(struct usbnet *dev)
 {
-       const u8 *mac_addr;
-
        /* maybe the boot loader passed the MAC address in devicetree */
-       mac_addr = of_get_mac_address(dev->udev->dev.of_node);
-       if (!IS_ERR(mac_addr)) {
-               ether_addr_copy(dev->net->dev_addr, mac_addr);
-               return;
+       if (!eth_platform_get_mac_address(&dev->udev->dev,
+                       dev->net->dev_addr)) {
+               if (is_valid_ether_addr(dev->net->dev_addr)) {
+                       /* device tree values are valid so use them */
+                       netif_dbg(dev, ifup, dev->net, "MAC address read from the device tree\n");
+                       return;
+               }
        }
 
        /* try reading mac address from EEPROM */

diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 601fb40..ea0d5f0 100644 (file)
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -755,13 +755,14 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
 
 static void smsc95xx_init_mac_address(struct usbnet *dev)
 {
-       const u8 *mac_addr;
-
        /* maybe the boot loader passed the MAC address in devicetree */
-       mac_addr = of_get_mac_address(dev->udev->dev.of_node);
-       if (!IS_ERR(mac_addr)) {
-               ether_addr_copy(dev->net->dev_addr, mac_addr);
-               return;
+       if (!eth_platform_get_mac_address(&dev->udev->dev,
+                       dev->net->dev_addr)) {
+               if (is_valid_ether_addr(dev->net->dev_addr)) {
+                       /* device tree values are valid so use them */
+                       netif_dbg(dev, ifup, dev->net, "MAC address read from the device tree\n");
+                       return;
+               }
        }
 
        /* try reading mac address from EEPROM */