Unverified Commit 81eeb0a3 authored Aug 15, 2019 by Nishka Dasgupta Committed by Mark Brown Aug 15, 2019

regulator: core: Add label to collate of_node_put() statements

In function of_get_child_regulator(), the loop for_each_child_of_node()
contains two mid-loop return statements, each preceded by a statement
putting child. In order to reduce this repetition, create a new label,
err_node_put, that puts child and then returns the required value;
edit the mid-loop return blocks to instead go to this new label.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Link: https://lore.kernel.org/r/20190815053704.32156-1-nishkadg.linux@gmail.com

Signed-off-by: Mark Brown <broonie@kernel.org>

parent ff461ebf

drivers/regulator/core.c

+7 −6

Original line number	Original line	Diff line number	Diff line
	@@ -380,16 +380,17 @@ static struct device_node of_get_child_regulator(struct device_node parent,

	if (!regnode) {		if (!regnode) {
	regnode = of_get_child_regulator(child, prop_name);		regnode = of_get_child_regulator(child, prop_name);
	if (regnode) {		if (regnode)
	of_node_put(child);		goto err_node_put;
	return regnode;
	}
	} else {		} else {
	of_node_put(child);		goto err_node_put;
	return regnode;
	}		}
	}		}
	return NULL;		return NULL;

			err_node_put:
			of_node_put(child);
			return regnode;
	}		}

	/**		/**