]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
dma: dma-axi-dmac: simplify axi_dmac_parse_dt()
authorNuno Sá <nuno.sa@analog.com>
Tue, 4 Nov 2025 16:22:28 +0000 (16:22 +0000)
committerVinod Koul <vkoul@kernel.org>
Tue, 23 Dec 2025 11:13:15 +0000 (16:43 +0530)
Simplify axi_dmac_parse_dt() by using the cleanup device_node class for
automatically releasing the of_node reference when going out of scope.

Signed-off-by: Nuno Sá <nuno.sa@analog.com>
base-commit: 398035178503bf662281bbffb4bebce1460a4bc5
change-id: 20251104-axi-dmac-fixes-and-improvs-e3ad512a329c
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Link: https://patch.msgid.link/20251104-axi-dmac-fixes-and-improvs-v1-4-3e6fd9328f72@analog.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/dma-axi-dmac.c

index 15c569449a28493bd00e9b320ed83aa2a13144e2..045e9b9a90df562073c078835584a23f26d47350 100644 (file)
@@ -8,6 +8,7 @@
 
 #include <linux/adi-axi-common.h>
 #include <linux/bitfield.h>
+#include <linux/cleanup.h>
 #include <linux/clk.h>
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
@@ -927,22 +928,18 @@ static int axi_dmac_parse_chan_dt(struct device_node *of_chan,
 
 static int axi_dmac_parse_dt(struct device *dev, struct axi_dmac *dmac)
 {
-       struct device_node *of_channels, *of_chan;
        int ret;
 
-       of_channels = of_get_child_by_name(dev->of_node, "adi,channels");
+       struct device_node *of_channels __free(device_node) = of_get_child_by_name(dev->of_node,
+                                                                                  "adi,channels");
        if (of_channels == NULL)
                return -ENODEV;
 
-       for_each_child_of_node(of_channels, of_chan) {
+       for_each_child_of_node_scoped(of_channels, of_chan) {
                ret = axi_dmac_parse_chan_dt(of_chan, &dmac->chan);
-               if (ret) {
-                       of_node_put(of_chan);
-                       of_node_put(of_channels);
+               if (ret)
                        return -EINVAL;
-               }
        }
-       of_node_put(of_channels);
 
        return 0;
 }