ethernet: use platform_get_ethdev_address()

Use the new platform_get_ethdev_address() helper for the cases
where dev->dev_addr is passed in directly as the destination.

  @@
  expression dev, net;
  @@
  - eth_platform_get_mac_address(dev, net->dev_addr)
  + platform_get_ethdev_address(dev, net)

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/actions/owl-emac.c b/drivers/net/ethernet/actions/owl-emac.c
index 2c25ff3623cd3c73abb31a5e12801e3b5c277099..dce93acd164496f5f89a24b2dd5ae1714f18bd1a 100644 (file)
--- a/drivers/net/ethernet/actions/owl-emac.c
+++ b/drivers/net/ethernet/actions/owl-emac.c
@@ -1385,7 +1385,7 @@ static void owl_emac_get_mac_addr(struct net_device *netdev)
        struct device *dev = netdev->dev.parent;
        int ret;
 
-       ret = eth_platform_get_mac_address(dev, netdev->dev_addr);
+       ret = platform_get_ethdev_address(dev, netdev);
        if (!ret && is_valid_ether_addr(netdev->dev_addr))
                return;
 

diff --git a/drivers/net/ethernet/mediatek/mtk_star_emac.c b/drivers/net/ethernet/mediatek/mtk_star_emac.c
index 1d5dd2015453fbe2bc0ef3ad03aedb78ea523740..e2ebfd8115a0d58aaa2fa4faad2db9dfb18b0637 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_star_emac.c
+++ b/drivers/net/ethernet/mediatek/mtk_star_emac.c
@@ -1544,7 +1544,7 @@ static int mtk_star_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       ret = eth_platform_get_mac_address(dev, ndev->dev_addr);
+       ret = platform_get_ethdev_address(dev, ndev);
        if (ret || !is_valid_ether_addr(ndev->dev_addr))
                eth_hw_addr_random(ndev);
 

diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c
index 76f7af1613139b9bfc2a4ecf0c75c2819127a04f..3b6987bb4fbe669f791a1d5401283507ea70657f 100644 (file)
--- a/drivers/net/usb/smsc75xx.c
+++ b/drivers/net/usb/smsc75xx.c
@@ -758,8 +758,7 @@ static int smsc75xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
 static void smsc75xx_init_mac_address(struct usbnet *dev)
 {
        /* maybe the boot loader passed the MAC address in devicetree */
-       if (!eth_platform_get_mac_address(&dev->udev->dev,
-                       dev->net->dev_addr)) {
+       if (!platform_get_ethdev_address(&dev->udev->dev, dev->net)) {
                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");

diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 26b1bd8e845b437b7fdff7e22d8c4803fc020268..21a42a6527dc1f9442897a0b5285adbdda71ba54 100644 (file)
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -756,8 +756,7 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
 static void smsc95xx_init_mac_address(struct usbnet *dev)
 {
        /* maybe the boot loader passed the MAC address in devicetree */
-       if (!eth_platform_get_mac_address(&dev->udev->dev,
-                       dev->net->dev_addr)) {
+       if (!platform_get_ethdev_address(&dev->udev->dev, dev->net)) {
                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");