[PATCH 01/25] clk: Fix debugfs clk_possible_parents for clks without parent string names
From: Chen-Yu Tsai
Date: Mon May 20 2019 - 04:09:51 EST
From: Chen-Yu Tsai <wens@xxxxxxxx>
Following the commit fc0c209c147f ("clk: Allow parents to be specified
without string names"), the parent name string is not always populated.
Instead, fetch the parents clk_core struct using the appropriate helper,
and read its name directly.
Fixes: fc0c209c147f ("clk: Allow parents to be specified without string names")
Signed-off-by: Chen-Yu Tsai <wens@xxxxxxxx>
---
drivers/clk/clk.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index aa51756fd4d6..bdb077ba59b9 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -3000,12 +3000,16 @@ DEFINE_SHOW_ATTRIBUTE(clk_flags);
static int possible_parents_show(struct seq_file *s, void *data)
{
struct clk_core *core = s->private;
+ struct clk_core *parent;
int i;
- for (i = 0; i < core->num_parents - 1; i++)
- seq_printf(s, "%s ", core->parents[i].name);
+ for (i = 0; i < core->num_parents - 1; i++) {
+ parent = clk_core_get_parent_by_index(core, i);
+ seq_printf(s, "%s ", parent ? parent->name : NULL);
+ }
- seq_printf(s, "%s\n", core->parents[i].name);
+ parent = clk_core_get_parent_by_index(core, i);
+ seq_printf(s, "%s", parent ? parent->name : NULL);
return 0;
}
--
2.20.1