eth: fwnode: remove the addr len from mac helpers

All callers pass in ETH_ALEN and the function itself
will return -EINVAL for any other address length.
Just assume it's ETH_ALEN like all other mac address
helpers (nvm, of, platform).

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/apm/xgene-v2/main.c b/drivers/net/ethernet/apm/xgene-v2/main.c
index c7253ecc0fa5bbff55d7bbb6215b72d4f4981084..d1ebd153b7a8fdec530a7c0441ce8882326eacb8 100644 (file)
--- a/drivers/net/ethernet/apm/xgene-v2/main.c
+++ b/drivers/net/ethernet/apm/xgene-v2/main.c
@@ -36,7 +36,7 @@ static int xge_get_resources(struct xge_pdata *pdata)
                return -ENOMEM;
        }
 
-       if (device_get_mac_address(dev, ndev->dev_addr, ETH_ALEN))
+       if (device_get_mac_address(dev, ndev->dev_addr))
                eth_hw_addr_random(ndev);
 
        memcpy(ndev->perm_addr, ndev->dev_addr, ndev->addr_len);

diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
index 268e099aa5e1626e9303d0d4e8db7df99c280ba9..4a5bf13ffae2ccd0c0344505be91b553feb60ed9 100644 (file)
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
@@ -1731,7 +1731,7 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
                xgene_get_port_id_acpi(dev, pdata);
 #endif
 
-       if (device_get_mac_address(dev, ndev->dev_addr, ETH_ALEN))
+       if (device_get_mac_address(dev, ndev->dev_addr))
                eth_hw_addr_random(ndev);
 
        memcpy(ndev->perm_addr, ndev->dev_addr, ndev->addr_len);

diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 30c5dcaea802b29fb62fa0b4ac0c2131a2b2e384..e61b687d33ba3caa3055eb075a3f38fef8caf4b1 100644 (file)
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -4084,7 +4084,7 @@ static int bcmgenet_probe(struct platform_device *pdev)
        if (pd && !IS_ERR_OR_NULL(pd->mac_address))
                eth_hw_addr_set(dev, pd->mac_address);
        else
-               if (device_get_mac_address(&pdev->dev, dev->dev_addr, ETH_ALEN))
+               if (device_get_mac_address(&pdev->dev, dev->dev_addr))
                        if (has_acpi_companion(&pdev->dev))
                                bcmgenet_get_hw_addr(priv, dev->dev_addr);
 

diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
index 77ce81633cdcaffd92754774c1fcbfd655757701..574a32f23f966b1d72f918ea8e78294551d29f30 100644 (file)
--- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
+++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
@@ -1389,7 +1389,7 @@ static int acpi_get_mac_address(struct device *dev, struct acpi_device *adev,
        u8 mac[ETH_ALEN];
        int ret;
 
-       ret = fwnode_get_mac_address(acpi_fwnode_handle(adev), mac, ETH_ALEN);
+       ret = fwnode_get_mac_address(acpi_fwnode_handle(adev), mac);
        if (ret) {
                dev_err(dev, "MAC address invalid: %pM\n", mac);
                return -EINVAL;

diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index 8de9c99a18fb4101ccb4f31a0c1f2aae886bae4a..86c2986395de736eb5d7334f0ebbdd20cddfb2fe 100644 (file)
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -183,7 +183,7 @@ static void ftgmac100_initial_mac(struct ftgmac100 *priv)
        unsigned int m;
        unsigned int l;
 
-       if (!device_get_mac_address(priv->dev, mac, ETH_ALEN)) {
+       if (!device_get_mac_address(priv->dev, mac)) {
                eth_hw_addr_set(priv->netdev, mac);
                dev_info(priv->dev, "Read MAC address %pM from device tree\n",
                         mac);

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
index 12b916399ba7b7e4e390f20ee51748b36ae62b24..1195f64fb1614a312fd18841bf52c292ecfaf7bd 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
@@ -1212,7 +1212,7 @@ static void hns_init_mac_addr(struct net_device *ndev)
 {
        struct hns_nic_priv *priv = netdev_priv(ndev);
 
-       if (device_get_mac_address(priv->dev, ndev->dev_addr, ETH_ALEN)) {
+       if (device_get_mac_address(priv->dev, ndev->dev_addr)) {
                eth_hw_addr_random(ndev);
                dev_warn(priv->dev, "No valid mac, use random mac %pM",
                         ndev->dev_addr);

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index b84f8b6fe9f421453fe3416eb9424d145aded8a7..ad3be55cce6800f0f09d16cc348a3a1014e42ef8 100644 (file)
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -6081,7 +6081,7 @@ static void mvpp2_port_copy_mac_addr(struct net_device *dev, struct mvpp2 *priv,
        char hw_mac_addr[ETH_ALEN] = {0};
        char fw_mac_addr[ETH_ALEN];
 
-       if (!fwnode_get_mac_address(fwnode, fw_mac_addr, ETH_ALEN)) {
+       if (!fwnode_get_mac_address(fwnode, fw_mac_addr)) {
                *mac_from = "firmware node";
                eth_hw_addr_set(dev, fw_mac_addr);
                return;

diff --git a/drivers/net/ethernet/microchip/enc28j60.c b/drivers/net/ethernet/microchip/enc28j60.c
index fa62311d326ad38618ff4e3c2a4b2dd76ed526fa..cca8aa70cfc98a72692df39f7b2e4397c5c2f6fd 100644 (file)
--- a/drivers/net/ethernet/microchip/enc28j60.c
+++ b/drivers/net/ethernet/microchip/enc28j60.c
@@ -1572,7 +1572,7 @@ static int enc28j60_probe(struct spi_device *spi)
                goto error_irq;
        }
 
-       if (!device_get_mac_address(&spi->dev, macaddr, sizeof(macaddr)))
+       if (!device_get_mac_address(&spi->dev, macaddr))
                eth_hw_addr_set(dev, macaddr);
        else
                eth_hw_addr_random(dev);

diff --git a/drivers/net/ethernet/qualcomm/emac/emac.c b/drivers/net/ethernet/qualcomm/emac/emac.c
index 2e913508fbeb50ca4e6cb1bde44fb88bacfc3231..b1b324f45fe71e4d05df5a84fce08a363418d71f 100644 (file)
--- a/drivers/net/ethernet/qualcomm/emac/emac.c
+++ b/drivers/net/ethernet/qualcomm/emac/emac.c
@@ -549,7 +549,7 @@ static int emac_probe_resources(struct platform_device *pdev,
        int ret = 0;
 
        /* get mac address */
-       if (!device_get_mac_address(&pdev->dev, maddr, ETH_ALEN))
+       if (!device_get_mac_address(&pdev->dev, maddr))
                eth_hw_addr_set(netdev, maddr);
        else
                eth_hw_addr_random(netdev);

diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
index d47308ace075052fd83e1496c0ac77712a807533..fa387510c189e88f08503ef26f38ad6830c67847 100644 (file)
--- a/drivers/net/ethernet/smsc/smsc911x.c
+++ b/drivers/net/ethernet/smsc/smsc911x.c
@@ -2375,7 +2375,7 @@ static int smsc911x_probe_config(struct smsc911x_platform_config *config,
                phy_interface = PHY_INTERFACE_MODE_NA;
        config->phy_interface = phy_interface;
 
-       device_get_mac_address(dev, config->mac, ETH_ALEN);
+       device_get_mac_address(dev, config->mac);
 
        err = device_property_read_u32(dev, "reg-io-width", &width);
        if (err == -ENXIO)

diff --git a/drivers/net/ethernet/socionext/netsec.c b/drivers/net/ethernet/socionext/netsec.c
index f8dd7fa5f632ab937c3434e2d34959f633511b00..7e3dd07ac94e4f52fdb2d3c98f9d1b25304b79cc 100644 (file)
--- a/drivers/net/ethernet/socionext/netsec.c
+++ b/drivers/net/ethernet/socionext/netsec.c
@@ -2034,7 +2034,7 @@ static int netsec_probe(struct platform_device *pdev)
                goto free_ndev;
        }
 
-       ret = device_get_mac_address(&pdev->dev, macbuf, sizeof(macbuf));
+       ret = device_get_mac_address(&pdev->dev, macbuf);
        if (!ret)
                eth_hw_addr_set(ndev, macbuf);
 

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 2f9be182fbfbb18e3d4a4d886437b3639ee8ad46..c21e05549f6199afd59c687fd84c978de16e6fbf 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -3224,7 +3224,7 @@ static int ath10k_core_probe_fw(struct ath10k *ar)
                ath10k_debug_print_board_info(ar);
        }
 
-       device_get_mac_address(ar->dev, ar->mac_addr, sizeof(ar->mac_addr));
+       device_get_mac_address(ar->dev, ar->mac_addr);
 
        ret = ath10k_core_init_firmware_features(ar);
        if (ret) {

diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index 8299f1cd917588e7c98f198eca2a340fce965829..bb612c7382e3dbcd4de291e12330d12979f6bc47 100644 (file)
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -31,8 +31,8 @@ struct fwnode_handle;
 int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr);
 unsigned char *arch_get_platform_mac_address(void);
 int nvmem_get_mac_address(struct device *dev, void *addrbuf);
-int device_get_mac_address(struct device *dev, char *addr, int alen);
-int fwnode_get_mac_address(struct fwnode_handle *fwnode, char *addr, int alen);
+int device_get_mac_address(struct device *dev, char *addr);
+int fwnode_get_mac_address(struct fwnode_handle *fwnode, char *addr);
 
 u32 eth_get_headlen(const struct net_device *dev, const void *data, u32 len);
 __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev);

diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 70692f5b514c607497b7fedaf62d99afcbb8f0f1..29447a61d3ec96b035a3104a29e846e214f82086 100644 (file)
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -561,14 +561,11 @@ int nvmem_get_mac_address(struct device *dev, void *addrbuf)
 EXPORT_SYMBOL(nvmem_get_mac_address);
 
 static int fwnode_get_mac_addr(struct fwnode_handle *fwnode,
-                              const char *name, char *addr, int alen)
+                              const char *name, char *addr)
 {
        int ret;
 
-       if (alen != ETH_ALEN)
-               return -EINVAL;
-
-       ret = fwnode_property_read_u8_array(fwnode, name, addr, alen);
+       ret = fwnode_property_read_u8_array(fwnode, name, addr, ETH_ALEN);
        if (ret)
                return ret;
 
@@ -581,7 +578,6 @@ static int fwnode_get_mac_addr(struct fwnode_handle *fwnode,
  * fwnode_get_mac_address - Get the MAC from the firmware node
  * @fwnode:    Pointer to the firmware node
  * @addr:      Address of buffer to store the MAC in
- * @alen:      Length of the buffer pointed to by addr, should be ETH_ALEN
  *
  * Search the firmware node for the best MAC address to use.  'mac-address' is
  * checked first, because that is supposed to contain to "most recent" MAC
@@ -600,11 +596,11 @@ static int fwnode_get_mac_addr(struct fwnode_handle *fwnode,
  * In this case, the real MAC is in 'local-mac-address', and 'mac-address'
  * exists but is all zeros.
  */
-int fwnode_get_mac_address(struct fwnode_handle *fwnode, char *addr, int alen)
+int fwnode_get_mac_address(struct fwnode_handle *fwnode, char *addr)
 {
-       if (!fwnode_get_mac_addr(fwnode, "mac-address", addr, alen) ||
-           !fwnode_get_mac_addr(fwnode, "local-mac-address", addr, alen) ||
-           !fwnode_get_mac_addr(fwnode, "address", addr, alen))
+       if (!fwnode_get_mac_addr(fwnode, "mac-address", addr) ||
+           !fwnode_get_mac_addr(fwnode, "local-mac-address", addr) ||
+           !fwnode_get_mac_addr(fwnode, "address", addr))
                return 0;
 
        return -ENOENT;
@@ -615,10 +611,9 @@ EXPORT_SYMBOL(fwnode_get_mac_address);
  * device_get_mac_address - Get the MAC for a given device
  * @dev:       Pointer to the device
  * @addr:      Address of buffer to store the MAC in
- * @alen:      Length of the buffer pointed to by addr, should be ETH_ALEN
  */
-int device_get_mac_address(struct device *dev, char *addr, int alen)
+int device_get_mac_address(struct device *dev, char *addr)
 {
-       return fwnode_get_mac_address(dev_fwnode(dev), addr, alen);
+       return fwnode_get_mac_address(dev_fwnode(dev), addr);
 }
 EXPORT_SYMBOL(device_get_mac_address);