Commit 4d04cdc5 authored Oct 07, 2021 by Jakub Kicinski Committed by David S. Miller Oct 08, 2021

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>

parent ba882580

drivers/net/ethernet/actions/owl-emac.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

drivers/net/ethernet/mediatek/mtk_star_emac.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

drivers/net/usb/smsc75xx.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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");

drivers/net/usb/smsc95xx.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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");