Unverified Commit e99769bf authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-6.12-soc' of... 

Merge tag 'tegra-for-6.12-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into soc/drivers

soc/tegra: Changes for v6.12-rc1

This is a single patch that simplifies code a little by employing the
new scoped OF helpers.

* tag 'tegra-for-6.12-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  soc/tegra: pmc: Simplify with scoped for each OF child loop

Link: https://lore.kernel.org/r/20240830141004.3195210-1-thierry.reding@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents cdcf6263 4d57a840

drivers/soc/tegra/pmc.c

+4 −8
Original line number Diff line number Diff line
@@ -1438,7 +1438,7 @@ static int tegra_powergate_init(struct tegra_pmc *pmc, 
				struct device_node *parent)

{

	struct of_phandle_args child_args, parent_args;

	struct device_node *np, *child;

	struct device_node *np;

	int err = 0;



	/*
@@ -1457,12 +1457,10 @@ static int tegra_powergate_init(struct tegra_pmc *pmc, 
	if (!np)

		return 0;



	for_each_child_of_node(np, child) {

	for_each_child_of_node_scoped(np, child) {

		err = tegra_powergate_add(pmc, child);

		if (err < 0) {

			of_node_put(child);

		if (err < 0)

			break;

		}



		if (of_parse_phandle_with_args(child, "power-domains",

					       "#power-domain-cells",
@@ -1474,11 +1472,9 @@ static int tegra_powergate_init(struct tegra_pmc *pmc, 


		err = of_genpd_add_subdomain(&parent_args, &child_args);

		of_node_put(parent_args.np);

		if (err) {

			of_node_put(child);

		if (err)

			break;

	}

	}



	of_node_put(np);