OSDN Git Service

net: mdio: mscc-miim: replace magic numbers for the bus reset
authorMichael Walle <michael@walle.cc>
Fri, 18 Mar 2022 20:13:23 +0000 (21:13 +0100)
committerJakub Kicinski <kuba@kernel.org>
Tue, 22 Mar 2022 05:33:01 +0000 (22:33 -0700)
Replace the magic numbers by macros which are already defined. It seems
the original commit missed to use them.

Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/mdio/mdio-mscc-miim.c

index 64fb76c..2f77bf7 100644 (file)
@@ -158,18 +158,18 @@ static int mscc_miim_reset(struct mii_bus *bus)
 {
        struct mscc_miim_dev *miim = bus->priv;
        int offset = miim->phy_reset_offset;
+       int reset_bits = PHY_CFG_PHY_ENA | PHY_CFG_PHY_COMMON_RESET |
+                        PHY_CFG_PHY_RESET;
        int ret;
 
        if (miim->phy_regs) {
-               ret = regmap_write(miim->phy_regs,
-                                  MSCC_PHY_REG_PHY_CFG + offset, 0);
+               ret = regmap_write(miim->phy_regs, offset, 0);
                if (ret < 0) {
                        WARN_ONCE(1, "mscc reset set error %d\n", ret);
                        return ret;
                }
 
-               ret = regmap_write(miim->phy_regs,
-                                  MSCC_PHY_REG_PHY_CFG + offset, 0x1ff);
+               ret = regmap_write(miim->phy_regs, offset, reset_bits);
                if (ret < 0) {
                        WARN_ONCE(1, "mscc reset clear error %d\n", ret);
                        return ret;
@@ -272,7 +272,7 @@ static int mscc_miim_probe(struct platform_device *pdev)
 
        miim = bus->priv;
        miim->phy_regs = phy_regmap;
-       miim->phy_reset_offset = 0;
+       miim->phy_reset_offset = MSCC_PHY_REG_PHY_CFG;
 
        ret = of_mdiobus_register(bus, pdev->dev.of_node);
        if (ret < 0) {