[PATCH net-next v3 04/13] net: dsa: realtek: Use __free() to simplify code
From: Jinjie Ruan <hidden>
Date: 2024-08-29 06:27:49
Also in:
linux-sunxi, netdev
Subsystem:
networking drivers, networking [dsa], realtek rtl83xx smi dsa router chips, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Vladimir Oltean, Linus Walleij, Alvin Šipraga, Linus Torvalds
Avoid need to manually handle of_node_put() by using __free(), which can simplfy code. Signed-off-by: Jinjie Ruan <redacted> Suggested-by: Jonathan Cameron <Jonathan.Cameron@Huawei.com> --- v3: - Move "return ret" up to the only place it can come from. - Use ret only in the loop. v2 - Split into 2 patches. --- drivers/net/dsa/realtek/rtl8366rb.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/drivers/net/dsa/realtek/rtl8366rb.c b/drivers/net/dsa/realtek/rtl8366rb.c
index 11243f89c98a..31d2d5356c1e 100644
--- a/drivers/net/dsa/realtek/rtl8366rb.c
+++ b/drivers/net/dsa/realtek/rtl8366rb.c@@ -1010,15 +1010,14 @@ static int rtl8366rb_setup_all_leds_off(struct realtek_priv *priv) static int rtl8366rb_setup_leds(struct realtek_priv *priv) { struct dsa_switch *ds = &priv->ds; - struct device_node *leds_np; struct dsa_port *dp; - int ret = 0; dsa_switch_for_each_port(dp, ds) { 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);
@@ -1026,15 +1025,11 @@ static int rtl8366rb_setup_leds(struct realtek_priv *priv) } for_each_child_of_node_scoped(leds_np, led_np) { - ret = rtl8366rb_setup_led(priv, dp, - of_fwnode_handle(led_np)); + int ret = rtl8366rb_setup_led(priv, dp, + of_fwnode_handle(led_np)); if (ret) - break; + return ret; } - - of_node_put(leds_np); - if (ret) - return ret; } return 0; }
--
2.34.1