Unverified Commit 1918a0d5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-arm-6.20-1' of... 

Merge tag 'mvebu-arm-6.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into soc/drivers

mvebu arm for 6.20 (part 1)

Simplify Dove PMU OF child node iteration with scoped loops

* tag 'mvebu-arm-6.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu

:
  soc: dove: pmu: Simplify with scoped for each OF child loop

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a393bda1 a1a359e1

drivers/soc/dove/pmu.c

+3 −6
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ int __init dove_init_pmu_legacy(const struct dove_pmu_initdata *initdata) 
 */

int __init dove_init_pmu(void)

{

	struct device_node *np_pmu, *domains_node, *np;

	struct device_node *np_pmu, *domains_node;

	struct pmu_data *pmu;

	int ret, parent_irq;
@@ -404,21 +404,18 @@ int __init dove_init_pmu(void) 


	pmu_reset_init(pmu);



	for_each_available_child_of_node(domains_node, np) {

	for_each_available_child_of_node_scoped(domains_node, np) {

		struct of_phandle_args args;

		struct pmu_domain *domain;



		domain = kzalloc(sizeof(*domain), GFP_KERNEL);

		if (!domain) {

			of_node_put(np);

		if (!domain)

			break;

		}



		domain->pmu = pmu;

		domain->base.name = kasprintf(GFP_KERNEL, "%pOFn", np);

		if (!domain->base.name) {

			kfree(domain);

			of_node_put(np);

			break;

		}