Use scoped for_each_available_child_of_node_scoped() when iterating
over device nodes to make code a bit simpler.

Signed-off-by: Jinjie Ruan <ruanjin...@huawei.com>
---
 drivers/soc/fsl/qe/qmc.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/drivers/soc/fsl/qe/qmc.c b/drivers/soc/fsl/qe/qmc.c
index 76bb496305a0..d5937b5b5f15 100644
--- a/drivers/soc/fsl/qe/qmc.c
+++ b/drivers/soc/fsl/qe/qmc.c
@@ -1174,31 +1174,26 @@ static unsigned int qmc_nb_chans(struct qmc *qmc)
 
 static int qmc_of_parse_chans(struct qmc *qmc, struct device_node *np)
 {
-       struct device_node *chan_np;
        struct qmc_chan *chan;
        const char *mode;
        u32 chan_id;
        u64 ts_mask;
        int ret;
 
-       for_each_available_child_of_node(np, chan_np) {
+       for_each_available_child_of_node_scoped(np, chan_np) {
                ret = of_property_read_u32(chan_np, "reg", &chan_id);
                if (ret) {
                        dev_err(qmc->dev, "%pOF: failed to read reg\n", 
chan_np);
-                       of_node_put(chan_np);
                        return ret;
                }
                if (chan_id > 63) {
                        dev_err(qmc->dev, "%pOF: Invalid chan_id\n", chan_np);
-                       of_node_put(chan_np);
                        return -EINVAL;
                }
 
                chan = devm_kzalloc(qmc->dev, sizeof(*chan), GFP_KERNEL);
-               if (!chan) {
-                       of_node_put(chan_np);
+               if (!chan)
                        return -ENOMEM;
-               }
 
                chan->id = chan_id;
                spin_lock_init(&chan->ts_lock);
@@ -1209,7 +1204,6 @@ static int qmc_of_parse_chans(struct qmc *qmc, struct 
device_node *np)
                if (ret) {
                        dev_err(qmc->dev, "%pOF: failed to read 
fsl,tx-ts-mask\n",
                                chan_np);
-                       of_node_put(chan_np);
                        return ret;
                }
                chan->tx_ts_mask_avail = ts_mask;
@@ -1219,7 +1213,6 @@ static int qmc_of_parse_chans(struct qmc *qmc, struct 
device_node *np)
                if (ret) {
                        dev_err(qmc->dev, "%pOF: failed to read 
fsl,rx-ts-mask\n",
                                chan_np);
-                       of_node_put(chan_np);
                        return ret;
                }
                chan->rx_ts_mask_avail = ts_mask;
@@ -1230,7 +1223,6 @@ static int qmc_of_parse_chans(struct qmc *qmc, struct 
device_node *np)
                if (ret && ret != -EINVAL) {
                        dev_err(qmc->dev, "%pOF: failed to read 
fsl,operational-mode\n",
                                chan_np);
-                       of_node_put(chan_np);
                        return ret;
                }
                if (!strcmp(mode, "transparent")) {
@@ -1240,7 +1232,6 @@ static int qmc_of_parse_chans(struct qmc *qmc, struct 
device_node *np)
                } else {
                        dev_err(qmc->dev, "%pOF: Invalid fsl,operational-mode 
(%s)\n",
                                chan_np, mode);
-                       of_node_put(chan_np);
                        return -EINVAL;
                }
 
-- 
2.34.1


Reply via email to