> -----Original Message----- > From: Willem de Bruijn <[email protected]> > Sent: 2021年1月27日 6:46 > To: Joakim Zhang <[email protected]> > Cc: Giuseppe Cavallaro <[email protected]>; Alexandre Torgue > <[email protected]>; Jose Abreu <[email protected]>; David > Miller <[email protected]>; Jakub Kicinski <[email protected]>; Network > Development <[email protected]>; dl-linux-imx <[email protected]>; > Andrew Lunn <[email protected]>; Florian Fainelli <[email protected]> > Subject: Re: [PATCH V3 1/6] net: stmmac: remove redundant null check for ptp > clock > > On Tue, Jan 26, 2021 at 7:05 AM Joakim Zhang <[email protected]> > 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.
I forgot to explicitly target as net when format the patch set again. This could be a fix even original patch(1c35cc9cf6a0) doesn't break anything, but it didn't do all the work as commit message commit. This patch targets net or net-next, this matter doesn't seem to be that important. If it is necessary, I can repost it next time as a separate patch for net-next. Thanks. Best Regards, Joakim Zhang > > Reviewed-by: Andrew Lunn <[email protected]> > > Signed-off-by: Joakim Zhang <[email protected]> > > --- > > 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 > >
