From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752186AbbBFLnL (ORCPT ); Fri, 6 Feb 2015 06:43:11 -0500 Received: from bhuna.collabora.co.uk ([93.93.135.160]:59114 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751176AbbBFLnK (ORCPT ); Fri, 6 Feb 2015 06:43:10 -0500 Message-ID: <54D4A8C9.9000507@collabora.com> Date: Fri, 06 Feb 2015 12:43:05 +0100 From: Tomeu Vizoso User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Stephen Boyd , Mike Turquette CC: linux-kernel@vger.kernel.org, Sylwester Nawrocki Subject: Re: [PATCH 3/3] clk: Replace of_clk_get_by_clkspec() with of_clk_get_from_provider() References: <1423181968-32149-1-git-send-email-sboyd@codeaurora.org> <1423181968-32149-4-git-send-email-sboyd@codeaurora.org> In-Reply-To: <1423181968-32149-4-git-send-email-sboyd@codeaurora.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/06/2015 01:19 AM, Stephen Boyd wrote: > of_clk_get_by_clkspec() has the same function signature as > of_clk_get_from_provider() > > struct clk *of_clk_get_by_clkspec(struct of_phandle_args > *clkspec) > struct clk *of_clk_get_from_provider(struct of_phandle_args > *clkspec) > > except of_clk_get_by_clkspec() checks to make sure clkspec is not > NULL. Let's remove of_clk_get_by_clkspec() and replace the > callers of it (clkconf.c) with of_clk_get_from_provider(). > > Cc: Sylwester Nawrocki > Signed-off-by: Stephen Boyd > --- > drivers/clk/clk-conf.c | 6 +++--- > drivers/clk/clk.c | 31 ++++++++++++++----------------- > drivers/clk/clk.h | 3 --- > drivers/clk/clkdev.c | 30 +----------------------------- > 4 files changed, 18 insertions(+), 52 deletions(-) > > diff --git a/drivers/clk/clk-conf.c b/drivers/clk/clk-conf.c > index aad4796aa3ed..6a681a2c4c89 100644 > --- a/drivers/clk/clk-conf.c > +++ b/drivers/clk/clk-conf.c > @@ -39,7 +39,7 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier) > } > if (clkspec.np == node && !clk_supplier) > return 0; > - pclk = of_clk_get_by_clkspec(&clkspec); > + pclk = of_clk_get_from_provider(&clkspec); > if (IS_ERR(pclk)) { > pr_warn("clk: couldn't get parent clock %d for %s\n", > index, node->full_name); > @@ -54,7 +54,7 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier) > rc = 0; > goto err; > } > - clk = of_clk_get_by_clkspec(&clkspec); > + clk = of_clk_get_from_provider(&clkspec); > if (IS_ERR(clk)) { > pr_warn("clk: couldn't get parent clock %d for %s\n", > index, node->full_name); > @@ -98,7 +98,7 @@ static int __set_clk_rates(struct device_node *node, bool clk_supplier) > if (clkspec.np == node && !clk_supplier) > return 0; > > - clk = of_clk_get_by_clkspec(&clkspec); > + clk = of_clk_get_from_provider(&clkspec); > if (IS_ERR(clk)) { > pr_warn("clk: couldn't get clock %d for %s\n", > index, node->full_name); > diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c > index 315dc22b7356..5d804a43ab1a 100644 > --- a/drivers/clk/clk.c > +++ b/drivers/clk/clk.c > @@ -2807,16 +2807,6 @@ static LIST_HEAD(of_clk_providers); > static DEFINE_MUTEX(of_clk_mutex); > > /* of_clk_provider list locking helpers */ Patch looks good to me, but this comment can be removed now. Reviewed-by: Tomeu Vizoso Thanks, Tomeu