From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933289AbbHKAb1 (ORCPT ); Mon, 10 Aug 2015 20:31:27 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:46599 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932670AbbHKAbZ (ORCPT ); Mon, 10 Aug 2015 20:31:25 -0400 Message-ID: <55C9425B.4060207@codeaurora.org> Date: Mon, 10 Aug 2015 17:31:23 -0700 From: Stephen Boyd User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130329 Thunderbird/17.0.5 MIME-Version: 1.0 To: Viresh Kumar CC: Rafael Wysocki , nm@ti.com, linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, khilman@linaro.org, Greg Kroah-Hartman , Len Brown , open list , Pavel Machek Subject: Re: [PATCH 2/6] PM / OPP: restructure _of_init_opp_table_v2() References: <804c420eb23e70448c3c2c93f867a0eab3536bfd.1439187821.git.viresh.kumar@linaro.org> <20150810192336.GC9678@codeaurora.org> <20150811002342.GD5766@linux> In-Reply-To: <20150811002342.GD5766@linux> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 08/10/2015 05:23 PM, Viresh Kumar wrote: > On 10-08-15, 12:23, Stephen Boyd wrote: >> >>> --- >>> drivers/base/power/opp.c | 21 ++++++++++----------- >>> 1 file changed, 10 insertions(+), 11 deletions(-) >>> >>> diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c >>> index 1daaa1a418a2..c9747fb192b1 100644 >>> --- a/drivers/base/power/opp.c >>> +++ b/drivers/base/power/opp.c >>> @@ -1295,20 +1295,19 @@ static int _of_init_opp_table_v2(struct device *dev, >>> if (WARN_ON(!count)) >>> goto out; >>> >>> - if (!ret) { >>> - if (!dev_opp) { >>> - dev_opp = _find_device_opp(dev); >>> - if (WARN_ON(!dev_opp)) >>> - goto out; >>> - } >>> - >>> - dev_opp->np = opp_np; >>> - dev_opp->shared_opp = of_property_read_bool(opp_np, >>> - "opp-shared"); >>> - } else { >>> + if (ret) { >>> of_free_opp_table(dev); >>> + goto out; >>> } >>> >>> + dev_opp = _find_device_opp(dev); >>> + if (WARN_ON(!dev_opp)) >>> + goto out; >> Doesn't ret = 0 in this case? > Because ret is already 0, juse see the above if (ret) check. So ret is 0. I thought it was an error path, but I guess this is a warning path and we return 0 still? > >> Why not drop the goto and just >> return some error code. Same for the goto out up above. > Actually yes, because we don't do anything special in goto now. But it > required more (unrelated) code changes, plus I didn't wanted to break > the 'return from single place' rule for this function, in case we > really need to free some resource or undo some work from the goto > place. > > But if you suggest/insist, then I will do it in a separate patch. I am not insisting anything. But another patch to get rid of the goto sounds fine. -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project