From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89D3AC433F5 for ; Thu, 7 Oct 2021 18:19:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 689D860F4C for ; Thu, 7 Oct 2021 18:19:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243570AbhJGSVB (ORCPT ); Thu, 7 Oct 2021 14:21:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:51534 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243558AbhJGSUu (ORCPT ); Thu, 7 Oct 2021 14:20:50 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9F2D661350; Thu, 7 Oct 2021 18:18:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1633630736; bh=Cz0683miZ9sVUu3xP5Yk83dJr3qVPGduYgd9V3ENaio=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bDtbeelR6U70bBtf7V4mb8QH2uhTqH/YtzT1/7KcL1FB0E8BvjGndnX3AAQ8t/gOx 8i9jF+u1lwb87HuTgkjxVIF2bZGFvcbOsIMO3J6+9JgA+67GGEtdGx4iMrAr3ghX0A fxv7qcCS+O10RDip1Y/uE3N9H36B+G782Dr/AR5El1D3u9P4ckzUvIr3DnBR2BtxqS oFxd2tbvzKEdYNLcCmxC0FMULH00pOQBlpw4NrBqWLO2q0kJe+h8xhJAa9Ke7tWdO2 KcyrhxkTVhYvD+Iz3EBYtL1ppDekab3CUuH7dyDho8e3WGzcEFXVMEYH2Eakxq/KCN +Jk4jl0S8d3+Q== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, vladimir.oltean@nxp.com, michael@walle.cc, andrew@lunn.ch, Jakub Kicinski Subject: [PATCH net-next v2 3/3] ethernet: use platform_get_ethdev_address() Date: Thu, 7 Oct 2021 11:18:47 -0700 Message-Id: <20211007181847.3529859-4-kuba@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211007181847.3529859-1-kuba@kernel.org> References: <20211007181847.3529859-1-kuba@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Reviewed-by: Andrew Lunn --- drivers/net/ethernet/actions/owl-emac.c | 2 +- drivers/net/ethernet/mediatek/mtk_star_emac.c | 2 +- drivers/net/usb/smsc75xx.c | 3 +-- drivers/net/usb/smsc95xx.c | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/actions/owl-emac.c b/drivers/net/ethernet/actions/owl-emac.c index 2c25ff3623cd..dce93acd1644 100644 --- 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 1d5dd2015453..e2ebfd8115a0 100644 --- 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 76f7af161313..3b6987bb4fbe 100644 --- 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 26b1bd8e845b..21a42a6527dc 100644 --- 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"); -- 2.31.1