On Mon, 12 Aug 2024 15:33:59 +0200
Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx> wrote:
> Use scoped for_each_child_of_node_scoped() when iterating over device
> nodes to make code a bit simpler.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
The final block is already a weird code structure, but your changes look fine
to me.
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
> ---
> drivers/memory/tegra/mc.c | 11 +++--------
> 1 file changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c
> index 224b488794e5..bd5b58f1fd42 100644
> --- a/drivers/memory/tegra/mc.c
> +++ b/drivers/memory/tegra/mc.c
> @@ -450,7 +450,6 @@ static int load_one_timing(struct tegra_mc *mc,
>
> static int load_timings(struct tegra_mc *mc, struct device_node *node)
> {
> - struct device_node *child;
> struct tegra_mc_timing *timing;
> int child_count = of_get_child_count(node);
> int i = 0, err;
> @@ -462,14 +461,12 @@ static int load_timings(struct tegra_mc *mc, struct device_node *node)
>
> mc->num_timings = child_count;
>
> - for_each_child_of_node(node, child) {
> + for_each_child_of_node_scoped(node, child) {
> timing = &mc->timings[i++];
>
> err = load_one_timing(mc, timing, child);
> - if (err) {
> - of_node_put(child);
> + if (err)
> return err;
> - }
> }
>
> return 0;
> @@ -477,7 +474,6 @@ static int load_timings(struct tegra_mc *mc, struct device_node *node)
>
> static int tegra_mc_setup_timings(struct tegra_mc *mc)
> {
> - struct device_node *node;
> u32 ram_code, node_ram_code;
> int err;
>
> @@ -485,14 +481,13 @@ static int tegra_mc_setup_timings(struct tegra_mc *mc)
>
> mc->num_timings = 0;
>
> - for_each_child_of_node(mc->dev->of_node, node) {
> + for_each_child_of_node_scoped(mc->dev->of_node, node) {
> err = of_property_read_u32(node, "nvidia,ram-code",
> &node_ram_code);
> if (err || (node_ram_code != ram_code))
> continue;
>
> err = load_timings(mc, node);
> - of_node_put(node);
> if (err)
> return err;
> break;
>
