From: Jakub Kicinski <kuba@kernel•org>
To: davem@davemloft•net
Cc: netdev@vger•kernel.org, rafael@kernel•org, saravanak@google•com,
mw@semihalf•com, andrew@lunn•ch, jeremy.linton@arm•com,
hkallweit1@gmail•com, linux@armlinux•org.uk, robh+dt@kernel•org,
frowand.list@gmail•com, heikki.krogerus@linux•intel.com,
devicetree@vger•kernel.org, snelson@pensando•io,
Jakub Kicinski <kuba@kernel•org>
Subject: [PATCH net-next v3 9/9] ethernet: make more use of device_get_ethdev_address()
Date: Wed, 6 Oct 2021 18:07:02 -0700 [thread overview]
Message-ID: <20211007010702.3438216-10-kuba@kernel.org> (raw)
In-Reply-To: <20211007010702.3438216-1-kuba@kernel.org>
Convert a few drivers to device_get_ethdev_address(),
saving a few LoC.
The check if addr is valid in netsec is superfluous,
device_get_ethdev_addr() already checks that (in
fwnode_get_mac_addr()).
Signed-off-by: Jakub Kicinski <kuba@kernel•org>
---
v2: new patch
---
drivers/net/ethernet/faraday/ftgmac100.c | 5 ++---
drivers/net/ethernet/microchip/enc28j60.c | 5 +----
drivers/net/ethernet/qualcomm/emac/emac.c | 5 +----
drivers/net/ethernet/socionext/netsec.c | 9 ++-------
4 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index 86c2986395de..97c5d70de76e 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -183,10 +183,9 @@ static void ftgmac100_initial_mac(struct ftgmac100 *priv)
unsigned int m;
unsigned int l;
- if (!device_get_mac_address(priv->dev, mac)) {
- eth_hw_addr_set(priv->netdev, mac);
+ if (!device_get_ethdev_address(priv->dev, priv->netdev)) {
dev_info(priv->dev, "Read MAC address %pM from device tree\n",
- mac);
+ priv->netdev->dev_addr);
return;
}
diff --git a/drivers/net/ethernet/microchip/enc28j60.c b/drivers/net/ethernet/microchip/enc28j60.c
index cca8aa70cfc9..634ac7649c43 100644
--- a/drivers/net/ethernet/microchip/enc28j60.c
+++ b/drivers/net/ethernet/microchip/enc28j60.c
@@ -1539,7 +1539,6 @@ static const struct net_device_ops enc28j60_netdev_ops = {
static int enc28j60_probe(struct spi_device *spi)
{
- unsigned char macaddr[ETH_ALEN];
struct net_device *dev;
struct enc28j60_net *priv;
int ret = 0;
@@ -1572,9 +1571,7 @@ static int enc28j60_probe(struct spi_device *spi)
goto error_irq;
}
- if (!device_get_mac_address(&spi->dev, macaddr))
- eth_hw_addr_set(dev, macaddr);
- else
+ if (device_get_ethdev_address(&spi->dev, dev))
eth_hw_addr_random(dev);
enc28j60_set_hw_macaddr(dev);
diff --git a/drivers/net/ethernet/qualcomm/emac/emac.c b/drivers/net/ethernet/qualcomm/emac/emac.c
index b1b324f45fe7..a55c52696d49 100644
--- a/drivers/net/ethernet/qualcomm/emac/emac.c
+++ b/drivers/net/ethernet/qualcomm/emac/emac.c
@@ -545,13 +545,10 @@ static int emac_probe_resources(struct platform_device *pdev,
struct emac_adapter *adpt)
{
struct net_device *netdev = adpt->netdev;
- char maddr[ETH_ALEN];
int ret = 0;
/* get mac address */
- if (!device_get_mac_address(&pdev->dev, maddr))
- eth_hw_addr_set(netdev, maddr);
- else
+ if (device_get_ethdev_address(&pdev->dev, netdev))
eth_hw_addr_random(netdev);
/* Core 0 interrupt */
diff --git a/drivers/net/ethernet/socionext/netsec.c b/drivers/net/ethernet/socionext/netsec.c
index 7e3dd07ac94e..baa9f5d1c549 100644
--- a/drivers/net/ethernet/socionext/netsec.c
+++ b/drivers/net/ethernet/socionext/netsec.c
@@ -1981,7 +1981,6 @@ static int netsec_probe(struct platform_device *pdev)
struct netsec_priv *priv;
u32 hw_ver, phy_addr = 0;
struct net_device *ndev;
- u8 macbuf[ETH_ALEN];
int ret;
mmio_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -2034,12 +2033,8 @@ static int netsec_probe(struct platform_device *pdev)
goto free_ndev;
}
- ret = device_get_mac_address(&pdev->dev, macbuf);
- if (!ret)
- eth_hw_addr_set(ndev, macbuf);
-
- if (priv->eeprom_base &&
- (ret || !is_valid_ether_addr(ndev->dev_addr))) {
+ ret = device_get_ethdev_address(&pdev->dev, ndev);
+ if (ret && priv->eeprom_base) {
void __iomem *macp = priv->eeprom_base +
NETSEC_EEPROM_MAC_ADDRESS;
--
2.31.1
next prev parent reply other threads:[~2021-10-07 1:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-07 1:06 [PATCH net-next v3 0/9] net: add a helpers for loading netdev->dev_addr from FW Jakub Kicinski
2021-10-07 1:06 ` [PATCH net-next v3 1/9] of: net: move of_net under net/ Jakub Kicinski
2021-10-07 12:12 ` Rob Herring
2021-10-07 1:06 ` [PATCH net-next v3 2/9] of: net: add a helper for loading netdev->dev_addr Jakub Kicinski
2021-10-07 1:06 ` [PATCH net-next v3 3/9] ethernet: use of_get_ethdev_address() Jakub Kicinski
2021-10-07 1:06 ` [PATCH net-next v3 4/9] device property: move mac addr helpers to eth.c Jakub Kicinski
2021-10-07 10:20 ` Heikki Krogerus
2021-10-07 1:06 ` [PATCH net-next v3 5/9] eth: fwnode: change the return type of mac address helpers Jakub Kicinski
2021-10-07 1:06 ` [PATCH net-next v3 6/9] eth: fwnode: remove the addr len from mac helpers Jakub Kicinski
2021-10-07 1:07 ` [PATCH net-next v3 7/9] eth: fwnode: add a helper for loading netdev->dev_addr Jakub Kicinski
2021-10-07 1:07 ` [PATCH net-next v3 8/9] ethernet: use device_get_ethdev_address() Jakub Kicinski
2021-10-07 1:07 ` Jakub Kicinski [this message]
2021-10-07 13:00 ` [PATCH net-next v3 0/9] net: add a helpers for loading netdev->dev_addr from FW patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211007010702.3438216-10-kuba@kernel.org \
--to=kuba@kernel$(echo .)org \
--cc=andrew@lunn$(echo .)ch \
--cc=davem@davemloft$(echo .)net \
--cc=devicetree@vger$(echo .)kernel.org \
--cc=frowand.list@gmail$(echo .)com \
--cc=heikki.krogerus@linux$(echo .)intel.com \
--cc=hkallweit1@gmail$(echo .)com \
--cc=jeremy.linton@arm$(echo .)com \
--cc=linux@armlinux$(echo .)org.uk \
--cc=mw@semihalf$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=rafael@kernel$(echo .)org \
--cc=robh+dt@kernel$(echo .)org \
--cc=saravanak@google$(echo .)com \
--cc=snelson@pensando$(echo .)io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox