| Message ID | 20240828032343.1218749-2-ruanjinjie@huawei.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: Simplified with scoped function | expand |
On Wed, 28 Aug 2024 11:23:31 +0800 Jinjie Ruan <ruanjinjie@huawei.com> wrote: > Avoid need to manually handle of_node_put() by using > for_each_child_of_node_scoped(), which can simplfy code. > > Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> LGTM Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
On Wed, Aug 28, 2024 at 11:23:31AM +0800, Jinjie Ruan wrote: > Avoid need to manually handle of_node_put() by using > for_each_child_of_node_scoped(), which can simplfy code. > > Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> > --- > drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c > index cc93f73a380e..8c5b4e0c0976 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c > @@ -774,7 +774,7 @@ static int sun8i_dwmac_reset(struct stmmac_priv *priv) > static int get_ephy_nodes(struct stmmac_priv *priv) > { > struct sunxi_priv_data *gmac = priv->plat->bsp_priv; > - struct device_node *mdio_mux, *iphynode; > + struct device_node *mdio_mux; > struct device_node *mdio_internal; > int ret; Networking uses reverse Christmas tree. Variables are sorted, longest first, shortest last. So you need to move mdio_mux after mdio_internal. The rest looks O.K. Andrew --- pw-bot: cr
On 2024/8/28 22:17, Andrew Lunn wrote: > On Wed, Aug 28, 2024 at 11:23:31AM +0800, Jinjie Ruan wrote: >> Avoid need to manually handle of_node_put() by using >> for_each_child_of_node_scoped(), which can simplfy code. >> >> Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> >> --- >> drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 6 ++---- >> 1 file changed, 2 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c >> index cc93f73a380e..8c5b4e0c0976 100644 >> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c >> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c >> @@ -774,7 +774,7 @@ static int sun8i_dwmac_reset(struct stmmac_priv *priv) >> static int get_ephy_nodes(struct stmmac_priv *priv) >> { >> struct sunxi_priv_data *gmac = priv->plat->bsp_priv; >> - struct device_node *mdio_mux, *iphynode; >> + struct device_node *mdio_mux; >> struct device_node *mdio_internal; >> int ret; > > Networking uses reverse Christmas tree. Variables are sorted, longest > first, shortest last. So you need to move mdio_mux after > mdio_internal. Right, it will look more clear. > > The rest looks O.K. > > > Andrew > > --- > pw-bot: cr
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c index cc93f73a380e..8c5b4e0c0976 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c @@ -774,7 +774,7 @@ static int sun8i_dwmac_reset(struct stmmac_priv *priv) static int get_ephy_nodes(struct stmmac_priv *priv) { struct sunxi_priv_data *gmac = priv->plat->bsp_priv; - struct device_node *mdio_mux, *iphynode; + struct device_node *mdio_mux; struct device_node *mdio_internal; int ret; @@ -793,7 +793,7 @@ static int get_ephy_nodes(struct stmmac_priv *priv) } /* Seek for internal PHY */ - for_each_child_of_node(mdio_internal, iphynode) { + for_each_child_of_node_scoped(mdio_internal, iphynode) { gmac->ephy_clk = of_clk_get(iphynode, 0); if (IS_ERR(gmac->ephy_clk)) continue; @@ -801,14 +801,12 @@ static int get_ephy_nodes(struct stmmac_priv *priv) if (IS_ERR(gmac->rst_ephy)) { ret = PTR_ERR(gmac->rst_ephy); if (ret == -EPROBE_DEFER) { - of_node_put(iphynode); of_node_put(mdio_internal); return ret; } continue; } dev_info(priv->device, "Found internal PHY node\n"); - of_node_put(iphynode); of_node_put(mdio_internal); return 0; }
Avoid need to manually handle of_node_put() by using for_each_child_of_node_scoped(), which can simplfy code. Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> --- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)