net: stmmac: dwmac-stm32: Clean up the debug prints

Use dev_err()/dev_dbg() and phy_modes() to print PHY mode instead of
pr_debug() and hand-written PHY mode decoding. This way, each debug
print has associated device with it and duplicated mode decoding is
removed.

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Christophe Roullier <christophe.roullier@foss.st.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
index aa413edd1ef71733d0fbf039546fa715e6a3aceb..75981ac2cbb5602f5fd6ef5e7270a3ff03f1e0e7 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
@@ -228,19 +228,16 @@ static int stm32mp1_configure_pmcr(struct plat_stmmacenet_data *plat_dat)
        switch (plat_dat->mac_interface) {
        case PHY_INTERFACE_MODE_MII:
                val = SYSCFG_PMCR_ETH_SEL_MII;
-               pr_debug("SYSCFG init : PHY_INTERFACE_MODE_MII\n");
                break;
        case PHY_INTERFACE_MODE_GMII:
                val = SYSCFG_PMCR_ETH_SEL_GMII;
                if (dwmac->enable_eth_ck)
                        val |= SYSCFG_PMCR_ETH_CLK_SEL;
-               pr_debug("SYSCFG init : PHY_INTERFACE_MODE_GMII\n");
                break;
        case PHY_INTERFACE_MODE_RMII:
                val = SYSCFG_PMCR_ETH_SEL_RMII;
                if (dwmac->enable_eth_ck)
                        val |= SYSCFG_PMCR_ETH_REF_CLK_SEL;
-               pr_debug("SYSCFG init : PHY_INTERFACE_MODE_RMII\n");
                break;
        case PHY_INTERFACE_MODE_RGMII:
        case PHY_INTERFACE_MODE_RGMII_ID:
@@ -249,15 +246,16 @@ static int stm32mp1_configure_pmcr(struct plat_stmmacenet_data *plat_dat)
                val = SYSCFG_PMCR_ETH_SEL_RGMII;
                if (dwmac->enable_eth_ck)
                        val |= SYSCFG_PMCR_ETH_CLK_SEL;
-               pr_debug("SYSCFG init : PHY_INTERFACE_MODE_RGMII\n");
                break;
        default:
-               pr_debug("SYSCFG init :  Do not manage %d interface\n",
-                        plat_dat->mac_interface);
+               dev_err(dwmac->dev, "Mode %s not supported",
+                       phy_modes(plat_dat->mac_interface));
                /* Do not manage others interfaces */
                return -EINVAL;
        }
 
+       dev_dbg(dwmac->dev, "Mode %s", phy_modes(plat_dat->mac_interface));
+
        /* Need to update PMCCLRR (clear register) */
        regmap_write(dwmac->regmap, reg + SYSCFG_PMCCLRR_OFFSET,
                     dwmac->ops->syscfg_eth_mask);
@@ -291,19 +289,19 @@ static int stm32mcu_set_mode(struct plat_stmmacenet_data *plat_dat)
        switch (plat_dat->mac_interface) {
        case PHY_INTERFACE_MODE_MII:
                val = SYSCFG_MCU_ETH_SEL_MII;
-               pr_debug("SYSCFG init : PHY_INTERFACE_MODE_MII\n");
                break;
        case PHY_INTERFACE_MODE_RMII:
                val = SYSCFG_MCU_ETH_SEL_RMII;
-               pr_debug("SYSCFG init : PHY_INTERFACE_MODE_RMII\n");
                break;
        default:
-               pr_debug("SYSCFG init :  Do not manage %d interface\n",
-                        plat_dat->mac_interface);
+               dev_err(dwmac->dev, "Mode %s not supported",
+                       phy_modes(plat_dat->mac_interface));
                /* Do not manage others interfaces */
                return -EINVAL;
        }
 
+       dev_dbg(dwmac->dev, "Mode %s", phy_modes(plat_dat->mac_interface));
+
        return regmap_update_bits(dwmac->regmap, reg,
                                 dwmac->ops->syscfg_eth_mask, val << 23);
 }