From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: To: , CC: , , , Dinh Nguyen , Peter Griffin , Gabriel FERNANDEZ Subject: [PATCH 4/6] clk: st: make use of of_clk_parent_fill helper function Date: Wed, 10 Jun 2015 16:49:23 -0500 Message-ID: <1433972965-24974-5-git-send-email-dinguyen@opensource.altera.com> In-Reply-To: <1433972965-24974-1-git-send-email-dinguyen@opensource.altera.com> References: <1433972965-24974-1-git-send-email-dinguyen@opensource.altera.com> MIME-Version: 1.0 Content-Type: text/plain Return-Path: dinguyen@opensource.altera.com List-ID: From: Dinh Nguyen Use of_clk_parent_fill to fill in the parent clock names' array. Signed-off-by: Dinh Nguyen Cc: Peter Griffin Cc: Gabriel FERNANDEZ --- drivers/clk/st/clk-flexgen.c | 6 ++---- drivers/clk/st/clkgen-mux.c | 7 ++----- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/clk/st/clk-flexgen.c b/drivers/clk/st/clk-flexgen.c index 657ca14..ed0696c 100644 --- a/drivers/clk/st/clk-flexgen.c +++ b/drivers/clk/st/clk-flexgen.c @@ -243,7 +243,7 @@ static const char ** __init flexgen_get_parents(struct device_node *np, int *num_parents) { const char **parents; - int nparents, i; + int nparents; nparents = of_clk_get_parent_count(np); if (WARN_ON(nparents <= 0)) @@ -253,10 +253,8 @@ static const char ** __init flexgen_get_parents(struct device_node *np, if (!parents) return NULL; - for (i = 0; i < nparents; i++) - parents[i] = of_clk_get_parent_name(np, i); + *num_parents = of_clk_parent_fill(np, parents, nparents); - *num_parents = nparents; return parents; } diff --git a/drivers/clk/st/clkgen-mux.c b/drivers/clk/st/clkgen-mux.c index 4fbe6e0..b83654a 100644 --- a/drivers/clk/st/clkgen-mux.c +++ b/drivers/clk/st/clkgen-mux.c @@ -24,7 +24,7 @@ static const char ** __init clkgen_mux_get_parents(struct device_node *np, int *num_parents) { const char **parents; - int nparents, i; + int nparents; nparents = of_clk_get_parent_count(np); if (WARN_ON(nparents <= 0)) @@ -34,10 +34,7 @@ static const char ** __init clkgen_mux_get_parents(struct device_node *np, if (!parents) return ERR_PTR(-ENOMEM); - for (i = 0; i < nparents; i++) - parents[i] = of_clk_get_parent_name(np, i); - - *num_parents = nparents; + *num_parents = of_clk_parent_fill(np, parents, nparents); return parents; } -- 2.2.1