On Mon, Sep 11, 2017 at 10:58:19AM +0200, Sylwester Nawrocki wrote: > On 09/11/2017 09:36 AM, Dong Aisheng wrote: > >'clock-names' property is optinal in DT, so of_clk_bulk_get() is introduced > >here to handle this for DT users without 'clock-names' specified. > > > >Cc: Stephen Boyd <sb...@codeaurora.org> > >Cc: Michael Turquette <mturque...@baylibre.com> > >Cc: Russell King <li...@arm.linux.org.uk> > >Reported-by: Shawn Guo <shawn...@kernel.org> > >Signed-off-by: Dong Aisheng <aisheng.d...@nxp.com> > >--- > > drivers/clk/clk-bulk.c | 31 +++++++++++++++++++++++++++++++ > > include/linux/clk.h | 8 ++++++++ > > 2 files changed, 39 insertions(+) > > > >diff --git a/drivers/clk/clk-bulk.c b/drivers/clk/clk-bulk.c > >index c834f5a..3179f28 100644 > >--- a/drivers/clk/clk-bulk.c > >+++ b/drivers/clk/clk-bulk.c > >@@ -19,6 +19,37 @@ > > #include <linux/clk.h> > > #include <linux/device.h> > > #include <linux/export.h> > >+#include <linux/of.h> > >+ > >+#if defined(CONFIG_OF) && defined(CONFIG_COMMON_CLK) > >+int __must_check of_clk_bulk_get(struct device_node *np, int num_clks, > >+ struct clk_bulk_data *clks) > >+{ > >+ int ret; > >+ int i; > >+ > >+ for (i = 0; i < num_clks; i++) > >+ clks[i].clk = NULL; > >+ > >+ for (i = 0; i < num_clks; i++) { > >+ clks[i].clk = of_clk_get(np, i); > >+ if (IS_ERR(clks[i].clk)) { > >+ ret = PTR_ERR(clks[i].clk); > > >+ pr_err("%s: Failed to get clk index: %d ret: %d\n", > >+ np->full_name, i, ret); > > AFAIU full_node is not supposed now to be dereferenced directly, > since storing of the full path string for each node is going to be > removed. %pOF needs to be used instead, e.g. > > pr_err("%pOF: failed to get clk %d: %d\n", np, i , ret); >
Thanks for telling this. Just see Rob sent patches to clean up it some days ago. Will update the patch. Regards Dong Aisheng > >+ clks[i].clk = NULL; > >+ goto err; > >+ } > >+ } > >+ > >+ return 0; > >+ > >+err: > >+ clk_bulk_put(i, clks); > >+ > >+ return ret; > >+} > >+#endif > > -- > Regards, > Sylwester > -- > To unsubscribe from this list: send the line "unsubscribe linux-clk" in > the body of a message to majord...@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html