Re: [PATCH V3 1/6] net: stmmac: remove redundant null check for ptp clock
From: Willem de Bruijn <willemdebruijn.kernel@gmail.com>
Date: 2021-01-27 13:03:08
On Tue, Jan 26, 2021 at 7:05 AM Joakim Zhang [off-list ref] wrote:
Remove redundant null check for ptp clock.
Fixes: 1c35cc9cf6a0 ("net: stmmac: remove redundant null check before clk_disable_unprepare()")This does not look like a fix to that patch, but another instance of a cleanup. The patchset also does not explicitly target net (for fixes) or net-next (for new improvements). I suppose this patch targets net-next.
quoted hunk ↗ jump to hunk
Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Joakim Zhang <redacted> --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 26b971cd4da5..11e0b30b2e01 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c@@ -5291,8 +5291,7 @@ int stmmac_resume(struct device *dev) /* enable the clk previously disabled */ clk_prepare_enable(priv->plat->stmmac_clk); clk_prepare_enable(priv->plat->pclk); - if (priv->plat->clk_ptp_ref) - clk_prepare_enable(priv->plat->clk_ptp_ref); + clk_prepare_enable(priv->plat->clk_ptp_ref); /* reset the phy so that it's ready */ if (priv->mii) stmmac_mdio_reset(priv->mii); --2.17.1