| Message ID | 20240828032343.1218749-5-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:34 +0800 Jinjie Ruan <ruanjinjie@huawei.com> wrote: > Avoid need to manually handle of_node_put() by using __free(), which > can simplfy code. > > Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> One suggestion inline. > --- > v2 > - Split into 2 patches. > --- > drivers/net/dsa/realtek/rtl8366rb.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/dsa/realtek/rtl8366rb.c b/drivers/net/dsa/realtek/rtl8366rb.c > index 7001b8b1c028..0acdcdd93ea2 100644 > --- a/drivers/net/dsa/realtek/rtl8366rb.c > +++ b/drivers/net/dsa/realtek/rtl8366rb.c > @@ -1009,7 +1009,6 @@ static int rtl8366rb_setup_all_leds_off(struct realtek_priv *priv) > > static int rtl8366rb_setup_leds(struct realtek_priv *priv) > { > - struct device_node *leds_np; > struct dsa_switch *ds = &priv->ds; > struct dsa_port *dp; > int ret = 0; > @@ -1018,7 +1017,8 @@ static int rtl8366rb_setup_leds(struct realtek_priv *priv) > if (!dp->dn) > continue; > > - leds_np = of_get_child_by_name(dp->dn, "leds"); > + struct device_node *leds_np __free(device_node) = > + of_get_child_by_name(dp->dn, "leds"); > if (!leds_np) { > dev_dbg(priv->dev, "No leds defined for port %d", > dp->index); > @@ -1032,7 +1032,6 @@ static int rtl8366rb_setup_leds(struct realtek_priv *priv) > break; > } > > - of_node_put(leds_np); > if (ret) > return ret; Move this return up to the only place it can come from which is inside the loop where the break is. You can then avoid initializing ret and indeed could bring it's scope into the loop for_each_child_of_node(leds_np, led_np) { int ret = rtl8366rb_setup_led(priv, dp, of_fwnode_handle(led_np)); if (ret) return ret; } > }
diff --git a/drivers/net/dsa/realtek/rtl8366rb.c b/drivers/net/dsa/realtek/rtl8366rb.c index 7001b8b1c028..0acdcdd93ea2 100644 --- a/drivers/net/dsa/realtek/rtl8366rb.c +++ b/drivers/net/dsa/realtek/rtl8366rb.c @@ -1009,7 +1009,6 @@ static int rtl8366rb_setup_all_leds_off(struct realtek_priv *priv) static int rtl8366rb_setup_leds(struct realtek_priv *priv) { - struct device_node *leds_np; struct dsa_switch *ds = &priv->ds; struct dsa_port *dp; int ret = 0; @@ -1018,7 +1017,8 @@ static int rtl8366rb_setup_leds(struct realtek_priv *priv) if (!dp->dn) continue; - leds_np = of_get_child_by_name(dp->dn, "leds"); + struct device_node *leds_np __free(device_node) = + of_get_child_by_name(dp->dn, "leds"); if (!leds_np) { dev_dbg(priv->dev, "No leds defined for port %d", dp->index); @@ -1032,7 +1032,6 @@ static int rtl8366rb_setup_leds(struct realtek_priv *priv) break; } - of_node_put(leds_np); if (ret) return ret; }
Avoid need to manually handle of_node_put() by using __free(), which can simplfy code. Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> --- v2 - Split into 2 patches. --- drivers/net/dsa/realtek/rtl8366rb.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)