Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755189AbaJWPtf (ORCPT ); Thu, 23 Oct 2014 11:49:35 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:41380 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751768AbaJWPtd (ORCPT ); Thu, 23 Oct 2014 11:49:33 -0400 Date: Thu, 23 Oct 2014 08:49:28 -0700 From: Dmitry Torokhov To: Grygorii Strashko Cc: ssantosh@kernel.org, "Rafael J. Wysocki" , khilman@linaro.org, linux-pm@vger.kernel.org, Rob Herring , grant.likely@secretlab.ca, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Geert Uytterhoeven , Ulf Hansson Subject: Re: [PATCH v3 1/5] PM / clock_ops: Add pm_clk_add_clk() Message-ID: <20141023154928.GC18714@dtor-ws> References: <1414074182-25980-1-git-send-email-grygorii.strashko@ti.com> <1414074182-25980-2-git-send-email-grygorii.strashko@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1414074182-25980-2-git-send-email-grygorii.strashko@ti.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Oct 23, 2014 at 05:22:58PM +0300, Grygorii Strashko wrote: > From: Geert Uytterhoeven > > The existing pm_clk_add() allows to pass a clock by con_id. However, > when referring to a specific clock from DT, no con_id is available. > > Add pm_clk_add_clk(), which allows to specify the struct clk * directly. > > CC: Ulf Hansson > CC: Dmitry Torokhov > Reviewed-by: Santosh Shilimkar > Reviewed-by: Kevin Hilman > Signed-off-by: Geert Uytterhoeven > Signed-off-by: Grygorii Strashko > --- > drivers/base/power/clock_ops.c | 41 +++++++++++++++++++++++++++++++---------- > include/linux/pm_clock.h | 8 ++++++++ > 2 files changed, 39 insertions(+), 10 deletions(-) > > diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c > index 7836930..f14b767 100644 > --- a/drivers/base/power/clock_ops.c > +++ b/drivers/base/power/clock_ops.c > @@ -53,7 +53,8 @@ static inline int __pm_clk_enable(struct device *dev, struct clk *clk) > */ > static void pm_clk_acquire(struct device *dev, struct pm_clock_entry *ce) > { > - ce->clk = clk_get(dev, ce->con_id); > + if (!ce->clk) > + ce->clk = clk_get(dev, ce->con_id); > if (IS_ERR(ce->clk)) { > ce->status = PCE_STATUS_ERROR; > } else { > @@ -63,15 +64,8 @@ static void pm_clk_acquire(struct device *dev, struct pm_clock_entry *ce) > } > } > > -/** > - * pm_clk_add - Start using a device clock for power management. > - * @dev: Device whose clock is going to be used for power management. > - * @con_id: Connection ID of the clock. > - * > - * Add the clock represented by @con_id to the list of clocks used for > - * the power management of @dev. > - */ > -int pm_clk_add(struct device *dev, const char *con_id) > +static int __pm_clk_add(struct device *dev, const char *con_id, > + struct clk *clk) > { > struct pm_subsys_data *psd = dev_to_psd(dev); > struct pm_clock_entry *ce; > @@ -93,6 +87,8 @@ int pm_clk_add(struct device *dev, const char *con_id) > kfree(ce); > return -ENOMEM; > } > + } else { You need __clk_get(clk) here, otherwise when you will be removing clocks you'll be dropping a reference that does not belong to you (as yiou have not taken it). > + ce->clk = clk; > } > Thanks. -- Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/