On Mon, 12 Aug 2024 15:34:03 +0200
Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx> wrote:
> Use scoped for_each_available_child_of_node_scoped() when iterating over
> device nodes to make code a bit simpler.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
Nothing wrong with this patch, but I think you can add a precusor
that will make this neater.
Jonathan
> ---
> drivers/memory/ti-aemif.c | 13 ++++---------
> 1 file changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/memory/ti-aemif.c b/drivers/memory/ti-aemif.c
> index e192db9e0e4b..cd2945d4ec18 100644
> --- a/drivers/memory/ti-aemif.c
> +++ b/drivers/memory/ti-aemif.c
> @@ -330,7 +330,6 @@ static int aemif_probe(struct platform_device *pdev)
> int ret = -ENODEV;
> struct device *dev = &pdev->dev;
> struct device_node *np = dev->of_node;
> - struct device_node *child_np;
> struct aemif_device *aemif;
> struct aemif_platform_data *pdata;
> struct of_dev_auxdata *dev_lookup;
> @@ -374,12 +373,10 @@ static int aemif_probe(struct platform_device *pdev)
> * functions iterate over these nodes and update the cs data
> * array.
> */
> - for_each_available_child_of_node(np, child_np) {
> + for_each_available_child_of_node_scoped(np, child_np) {
> ret = of_aemif_parse_abus_config(pdev, child_np);
> - if (ret < 0) {
> - of_node_put(child_np);
> + if (ret < 0)
> goto error;
I'd precede this patch with use of
devm_clk_get_enabled()
That would avoid what looks like potential mixed devm and not issues
and let you return here.
> - }
> }
> } else if (pdata && pdata->num_abus_data > 0) {
> for (i = 0; i < pdata->num_abus_data; i++, aemif->num_cs++) {
> @@ -402,13 +399,11 @@ static int aemif_probe(struct platform_device *pdev)
> * child will be probed after the AEMIF timing parameters are set.
> */
> if (np) {
> - for_each_available_child_of_node(np, child_np) {
> + for_each_available_child_of_node_scoped(np, child_np) {
> ret = of_platform_populate(child_np, NULL,
> dev_lookup, dev);
> - if (ret < 0) {
> - of_node_put(child_np);
> + if (ret < 0)
> goto error;
> - }
> }
> } else if (pdata) {
> for (i = 0; i < pdata->num_sub_devices; i++) {
>
