net: stmmac: use GENMASK_U32() for mdio bitfields

Rather than using hex numbers, use GENMASK() for mdio bitfields.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Tested-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Link: https://patch.msgid.link/E1vy6AO-0000000Btx7-2NDV@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
index a6f8e78856aa6234d631b6a29192543d88a487f8..b913fe5af4888741e81fc3c465230aa989066a17 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
@@ -367,8 +367,8 @@ static int loongson_dwmac_setup(void *apriv, struct mac_device_info *mac)
        mac->link.speed_mask = GMAC_CONTROL_PS | GMAC_CONTROL_FES;
        mac->mii.addr = GMAC_MII_ADDR;
        mac->mii.data = GMAC_MII_DATA;
-       mac->mii.addr_mask = 0x0000F800;
-       mac->mii.reg_mask = 0x000007C0;
+       mac->mii.addr_mask = GENMASK_U32(15, 11);
+       mac->mii.reg_mask = GENMASK_U32(10, 6);
        mac->mii.clk_csr_mask = GENMASK_U32(5, 2);
 
        return 0;

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
index 4ea55be04c5c9a70222c9ea1f00b59bccf87736b..c7cb306726042799695eff2ac979316096b397c2 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
@@ -496,8 +496,8 @@ int dwmac1000_setup(struct stmmac_priv *priv)
        mac->link.speed_mask = GMAC_CONTROL_PS | GMAC_CONTROL_FES;
        mac->mii.addr = GMAC_MII_ADDR;
        mac->mii.data = GMAC_MII_DATA;
-       mac->mii.addr_mask = 0x0000F800;
-       mac->mii.reg_mask = 0x000007C0;
+       mac->mii.addr_mask = GENMASK_U32(15, 11);
+       mac->mii.reg_mask = GENMASK_U32(10, 6);
        mac->mii.clk_csr_mask = GENMASK_U32(5, 2);
 
        return 0;

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
index 7c91ea2775d410efaa96f2b7ab32428038de750c..6b5cf3a0866a3dacc1b25d839905ebadc74d4e3f 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
@@ -184,8 +184,8 @@ int dwmac100_setup(struct stmmac_priv *priv)
        mac->link.speed_mask = MAC_CONTROL_PS;
        mac->mii.addr = MAC_MII_ADDR;
        mac->mii.data = MAC_MII_DATA;
-       mac->mii.addr_mask = 0x0000F800;
-       mac->mii.reg_mask = 0x000007C0;
+       mac->mii.addr_mask = GENMASK_U32(15, 11);
+       mac->mii.reg_mask = GENMASK_U32(10, 6);
        mac->mii.clk_csr_mask = GENMASK_U32(5, 2);
 
        return 0;