Re: [PATCH RESEND] clk: Fix JSON output in debugfs

From: Stephen Boyd
Date: Thu Apr 30 2015 - 21:34:19 EST


On 04/30, Felipe Balbi wrote:
> On Thu, Apr 30, 2015 at 05:37:12PM -0700, Stephen Boyd wrote:
> > On 04/29, Stefan Wahren wrote:
> > > key/value pairs in a JSON object must be separated by a comma.
> > > After adding the properties "accuracy" and "phase" the JSON output
> > > of /sys/kernel/debug/clk/clk_dump is invalid.
> > >
> > > So add the missing commas to fix it.
> > >
> > > Fixes: 5279fc4 ("clk: add clk accuracy retrieval support")
> > > Signed-off-by: Stefan Wahren <stefan.wahren@xxxxxxxx>
> >
> > Hmph, this regression is old, v3.14 days. We probably ought to
> > have a comment in here stating this should be JSON format.
> >
> > Applied to clk-next with the comment below squashed in.
> >
> > ----8<----
> > diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
> > index 5edbec6dfb20..b850a0ef5b9f 100644
> > --- a/drivers/clk/clk.c
> > +++ b/drivers/clk/clk.c
> > @@ -1974,6 +1974,7 @@ static void clk_dump_one(struct seq_file *s, struct clk_core *c, int level)
> > if (!c)
> > return;
> >
> > + /* This should be JSON format, i.e. elements separated with a comma */
> > seq_printf(s, "\"%s\": { ", c->name);
> > seq_printf(s, "\"enable_count\": %d,", c->enable_count);
> > seq_printf(s, "\"prepare_count\": %d,", c->prepare_count);
>
> you probably want to a newline character after all clocks have been
> dumped.

Sure. Please send it as a separate patch with signed-off and I'll
apply. It doesn't seem like a fix for a regression.

--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/