From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752190AbcBBCmC (ORCPT ); Mon, 1 Feb 2016 21:42:02 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:44959 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751344AbcBBCmA (ORCPT ); Mon, 1 Feb 2016 21:42:00 -0500 Date: Mon, 1 Feb 2016 18:41:58 -0800 From: Stephen Boyd To: Insu Yun Cc: mturquette@baylibre.com, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, taesoo@gatech.edu, yeongjin.jang@gatech.edu, insu@gatech.edu, changwoo@gatech.edu Subject: Re: [PATCH] clk: unlock for handling unregisterd clock Message-ID: <20160202024158.GM4848@codeaurora.org> References: <1454166724-17374-1-git-send-email-wuninsu@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1454166724-17374-1-git-send-email-wuninsu@gmail.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 01/30, Insu Yun wrote: > If clock is already unregistered, it returns with holding lock. > It needs to be unlocked. > > Signed-off-by: Insu Yun > --- Applied to clk-next but I changed it to a goto: ---8<--- From: Insu Yun Subject: [PATCH] clk: unlock for handling unregisterd clock If clock is already unregistered, it returns with holding lock. It needs to be unlocked. Signed-off-by: Insu Yun [sboyd@codeaurora.org: Use goto instead] Signed-off-by: Stephen Boyd --- drivers/clk/clk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index fff87b39944f..7d247a26a212 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -2639,7 +2639,7 @@ void clk_unregister(struct clk *clk) if (clk->core->ops == &clk_nodrv_ops) { pr_err("%s: unregistered clock: %s\n", __func__, clk->core->name); - return; + goto unlock; } /* * Assign empty clock ops for consumers that might still hold @@ -2665,7 +2665,7 @@ void clk_unregister(struct clk *clk) pr_warn("%s: unregistering prepared clock: %s\n", __func__, clk->core->name); kref_put(&clk->core->ref, __clk_release); - +unlock: clk_prepare_unlock(); } EXPORT_SYMBOL_GPL(clk_unregister); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project