net: xgbe: use device_get_mac_addr

device_get_mac_addr is basically device_property_read_u8_array with an
is_valid_ether_addr call. Allows just checking for ret.

Remove XGBE_MAC_ADDR_PROPERTY. device_get_mac_addr supports more
properties than just "mac-address".

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Reviewed-by: Sai Krishna <saikrishnag@marvell.com>
Link: https://patch.msgid.link/20260310194647.3794-1-rosenp@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-platform.c b/drivers/net/ethernet/amd/xgbe/xgbe-platform.c
index 98b03a3f3a957ed6b465d95f0c09f58472327539..bca0dbff80c172f27f315d38bd325d244513003b 100644 (file)
--- a/drivers/net/ethernet/amd/xgbe/xgbe-platform.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-platform.c
@@ -252,13 +252,9 @@ static int xgbe_platform_probe(struct platform_device *pdev)
                dev_dbg(dev, "sir1_regs  = %p\n", pdata->sir1_regs);
 
        /* Retrieve the MAC address */
-       ret = device_property_read_u8_array(dev, XGBE_MAC_ADDR_PROPERTY,
-                                           pdata->mac_addr,
-                                           sizeof(pdata->mac_addr));
-       if (ret || !is_valid_ether_addr(pdata->mac_addr)) {
-               dev_err(dev, "invalid %s property\n", XGBE_MAC_ADDR_PROPERTY);
-               if (!ret)
-                       ret = -EINVAL;
+       ret = device_get_mac_address(dev, pdata->mac_addr);
+       if (ret) {
+               dev_err(dev, "invalid MAC address property\n");
                goto err_io;
        }
 

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
index 5ee08e3c7d2b0257367942c2fd256b36217763a0..60b7e53206d1e18f541c96f335613ccc1d4197a4 100644 (file)
--- a/drivers/net/ethernet/amd/xgbe/xgbe.h
+++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
@@ -96,7 +96,6 @@
        min_t(unsigned int, IEEE_8021QAZ_MAX_TCS, (_cnt))
 
 /* Common property names */
-#define XGBE_MAC_ADDR_PROPERTY "mac-address"
 #define XGBE_PHY_MODE_PROPERTY "phy-mode"
 #define XGBE_DMA_IRQS_PROPERTY "amd,per-channel-interrupt"
 #define XGBE_SPEEDSET_PROPERTY "amd,speed-set"