Skip to content

Commit 6064cfa

Browse files
bijudasbebarino
authored andcommitted
clk: davinci: Use of_get_available_child_by_name()
Simplify of_davinci_pll_init() by using of_get_available_child_by_name(). While at it, move of_node_put(child) inside the if block to avoid additional check if of_child is NULL. Reviewed-by: David Lechner <david@lechnology.com> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> Link: https://lore.kernel.org/r/20250410062040.6346-1-biju.das.jz@bp.renesas.com Signed-off-by: Stephen Boyd <sboyd@kernel.org>
1 parent 73c46d9 commit 6064cfa

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

drivers/clk/davinci/pll.c

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -763,13 +763,14 @@ int of_davinci_pll_init(struct device *dev, struct device_node *node,
763763
return PTR_ERR(clk);
764764
}
765765

766-
child = of_get_child_by_name(node, "pllout");
767-
if (of_device_is_available(child))
766+
child = of_get_available_child_by_name(node, "pllout");
767+
if (child) {
768768
of_clk_add_provider(child, of_clk_src_simple_get, clk);
769-
of_node_put(child);
769+
of_node_put(child);
770+
}
770771

771-
child = of_get_child_by_name(node, "sysclk");
772-
if (of_device_is_available(child)) {
772+
child = of_get_available_child_by_name(node, "sysclk");
773+
if (child) {
773774
struct clk_onecell_data *clk_data;
774775
struct clk **clks;
775776
int n_clks = max_sysclk_id + 1;
@@ -803,11 +804,11 @@ int of_davinci_pll_init(struct device *dev, struct device_node *node,
803804
clks[(*div_info)->id] = clk;
804805
}
805806
of_clk_add_provider(child, of_clk_src_onecell_get, clk_data);
807+
of_node_put(child);
806808
}
807-
of_node_put(child);
808809

809-
child = of_get_child_by_name(node, "auxclk");
810-
if (of_device_is_available(child)) {
810+
child = of_get_available_child_by_name(node, "auxclk");
811+
if (child) {
811812
char child_name[MAX_NAME_SIZE];
812813

813814
snprintf(child_name, MAX_NAME_SIZE, "%s_auxclk", info->name);
@@ -818,11 +819,12 @@ int of_davinci_pll_init(struct device *dev, struct device_node *node,
818819
child_name, PTR_ERR(clk));
819820
else
820821
of_clk_add_provider(child, of_clk_src_simple_get, clk);
822+
823+
of_node_put(child);
821824
}
822-
of_node_put(child);
823825

824-
child = of_get_child_by_name(node, "obsclk");
825-
if (of_device_is_available(child)) {
826+
child = of_get_available_child_by_name(node, "obsclk");
827+
if (child) {
826828
if (obsclk_info)
827829
clk = davinci_pll_obsclk_register(dev, obsclk_info, base);
828830
else
@@ -833,8 +835,8 @@ int of_davinci_pll_init(struct device *dev, struct device_node *node,
833835
PTR_ERR(clk));
834836
else
835837
of_clk_add_provider(child, of_clk_src_simple_get, clk);
838+
of_node_put(child);
836839
}
837-
of_node_put(child);
838840

839841
return 0;
840842
}

0 commit comments

Comments
 (0)