[PATCH v2 16/24] net: stmmac: Use optional reset control API to work with stmmaceth

[Jisheng Zhang]

Hi,

On Mon, 8 Feb 2021 16:56:00 +0300 Serge Semin wrote:


> 
> Since commit bb3222f71b57 ("net: stmmac: platform: use optional clk/reset
> get APIs") a manual implementation of the optional device reset control
> functionality has been replaced with using the
> devm_reset_control_get_optional() method. But for some reason the optional
> reset control handler usage hasn't been fixed and preserved the
> NULL-checking statements. There is no need in that in order to perform the
> reset control assertion/deassertion because the passed NULL will be
> considered by the reset framework as absent optional reset control handler
> anyway.
> 
> Fixes: bb3222f71b57 ("net: stmmac: platform: use optional clk/reset get APIs")

The patch itself looks good, but the Fix tag isn't necessary since the
patch is a clean up rather than a bug fix. Can you please drop it in next
version?

Thanks

> Signed-off-by: Serge Semin <Sergey.Semin at baikalelectronics.ru>
> ---
>  .../net/ethernet/stmicro/stmmac/stmmac_main.c | 19 ++++++++-----------
>  1 file changed, 8 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index 4f1bf8f6538b..a8dec219c295 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -4935,15 +4935,13 @@ int stmmac_dvr_probe(struct device *device,
>         if ((phyaddr >= 0) && (phyaddr <= 31))
>                 priv->plat->phy_addr = phyaddr;
> 
> -       if (priv->plat->stmmac_rst) {
> -               ret = reset_control_assert(priv->plat->stmmac_rst);
> -               reset_control_deassert(priv->plat->stmmac_rst);
> -               /* Some reset controllers have only reset callback instead of
> -                * assert + deassert callbacks pair.
> -                */
> -               if (ret == -ENOTSUPP)
> -                       reset_control_reset(priv->plat->stmmac_rst);
> -       }
> +       ret = reset_control_assert(priv->plat->stmmac_rst);
> +       reset_control_deassert(priv->plat->stmmac_rst);
> +       /* Some reset controllers have only reset callback instead of
> +        * assert + deassert callbacks pair.
> +        */
> +       if (ret == -ENOTSUPP)
> +               reset_control_reset(priv->plat->stmmac_rst);
> 
>         /* Init MAC and get the capabilities */
>         ret = stmmac_hw_init(priv);
> @@ -5155,8 +5153,7 @@ int stmmac_dvr_remove(struct device *dev)
>         stmmac_exit_fs(ndev);
>  #endif
>         phylink_destroy(priv->phylink);
> -       if (priv->plat->stmmac_rst)
> -               reset_control_assert(priv->plat->stmmac_rst);
> +       reset_control_assert(priv->plat->stmmac_rst);
>         if (priv->hw->pcs != STMMAC_PCS_TBI &&
>             priv->hw->pcs != STMMAC_PCS_RTBI)
>                 stmmac_mdio_unregister(ndev);
> --
> 2.29.2
>