Skip to content

Commit 7271bca

Browse files
krzkJassi Brar
authored andcommitted
mailbox: mtk-cmdq: Simplify with scoped for each OF child loop
Use scoped for-each loop when iterating over device nodes to make code a bit simpler. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com> Signed-off-by: Jassi Brar <jassisinghbrar@gmail.com>
1 parent dac2b98 commit 7271bca

1 file changed

Lines changed: 4 additions & 8 deletions

File tree

drivers/mailbox/mtk-cmdq-mailbox.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ static struct mbox_chan *cmdq_xlate(struct mbox_controller *mbox,
636636
static int cmdq_get_clocks(struct device *dev, struct cmdq *cmdq)
637637
{
638638
static const char * const gce_name = "gce";
639-
struct device_node *node, *parent = dev->of_node->parent;
639+
struct device_node *parent = dev->of_node->parent;
640640
struct clk_bulk_data *clks;
641641

642642
cmdq->clocks = devm_kcalloc(dev, cmdq->pdata->gce_num,
@@ -661,7 +661,7 @@ static int cmdq_get_clocks(struct device *dev, struct cmdq *cmdq)
661661
* as the clock of the main GCE must be enabled for additional IPs
662662
* to be reachable.
663663
*/
664-
for_each_child_of_node(parent, node) {
664+
for_each_child_of_node_scoped(parent, node) {
665665
int alias_id = of_alias_get_id(node, gce_name);
666666

667667
if (alias_id < 0 || alias_id >= cmdq->pdata->gce_num)
@@ -670,17 +670,13 @@ static int cmdq_get_clocks(struct device *dev, struct cmdq *cmdq)
670670
clks = &cmdq->clocks[alias_id];
671671

672672
clks->id = devm_kasprintf(dev, GFP_KERNEL, "gce%d", alias_id);
673-
if (!clks->id) {
674-
of_node_put(node);
673+
if (!clks->id)
675674
return -ENOMEM;
676-
}
677675

678676
clks->clk = of_clk_get(node, 0);
679-
if (IS_ERR(clks->clk)) {
680-
of_node_put(node);
677+
if (IS_ERR(clks->clk))
681678
return dev_err_probe(dev, PTR_ERR(clks->clk),
682679
"failed to get gce%d clock\n", alias_id);
683-
}
684680
}
685681

686682
return 0;

0 commit comments

Comments
 (0)