From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Rafael J. Wysocki" Subject: Re: [BUG FIX] PM / cpu_domains: Check for NULL callbacks Date: Thu, 18 Feb 2016 18:46:40 +0100 Message-ID: References: <1455310238-8963-4-git-send-email-lina.iyer@linaro.org> <1455816573-43849-1-git-send-email-lina.iyer@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: Received: from mail-lf0-f50.google.com ([209.85.215.50]:35712 "EHLO mail-lf0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423633AbcBRRqm (ORCPT ); Thu, 18 Feb 2016 12:46:42 -0500 In-Reply-To: <1455816573-43849-1-git-send-email-lina.iyer@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org List-Id: linux-arm-msm@vger.kernel.org To: Lina Iyer Cc: Ulf Hansson , Kevin Hilman , "Rafael J. Wysocki" , "linux-pm@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , Geert Uytterhoeven , k.kozlowski@samsung.com, msivasub@codeaurora.org, agross@codeaurora.org, Stephen Boyd , linux-arm-msm@vger.kernel.org, Lorenzo Pieralisi , ahaslam@baylibre.com, mtitinger@baylibre.com On Thu, Feb 18, 2016 at 6:29 PM, Lina Iyer wrote: > Check for NULL platform callback before calling. > > Signed-off-by: Lina Iyer > --- > drivers/base/power/cpu_domains.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/drivers/base/power/cpu_domains.c b/drivers/base/power/cpu_domains.c > index 7069411..bcaa474 100644 > --- a/drivers/base/power/cpu_domains.c > +++ b/drivers/base/power/cpu_domains.c > @@ -157,16 +157,22 @@ static int cpu_pd_power_on(struct generic_pm_domain *genpd) > { > struct cpu_pm_domain *pd = to_cpu_pd(genpd); > > - return pd->ops.power_on(); > + if (pd->ops.power_on) > + return pd->ops.power_on(); > + > + return 0; > } I usually write things like that as return pd->ops.power_on ? pd->ops.power_on() : 0; That gets the job done in just one line of code instead of 4 and in one statement instead of 3. Thanks, Rafael From mboxrd@z Thu Jan 1 00:00:00 1970 From: rafael@kernel.org (Rafael J. Wysocki) Date: Thu, 18 Feb 2016 18:46:40 +0100 Subject: [BUG FIX] PM / cpu_domains: Check for NULL callbacks In-Reply-To: <1455816573-43849-1-git-send-email-lina.iyer@linaro.org> References: <1455310238-8963-4-git-send-email-lina.iyer@linaro.org> <1455816573-43849-1-git-send-email-lina.iyer@linaro.org> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thu, Feb 18, 2016 at 6:29 PM, Lina Iyer wrote: > Check for NULL platform callback before calling. > > Signed-off-by: Lina Iyer > --- > drivers/base/power/cpu_domains.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/drivers/base/power/cpu_domains.c b/drivers/base/power/cpu_domains.c > index 7069411..bcaa474 100644 > --- a/drivers/base/power/cpu_domains.c > +++ b/drivers/base/power/cpu_domains.c > @@ -157,16 +157,22 @@ static int cpu_pd_power_on(struct generic_pm_domain *genpd) > { > struct cpu_pm_domain *pd = to_cpu_pd(genpd); > > - return pd->ops.power_on(); > + if (pd->ops.power_on) > + return pd->ops.power_on(); > + > + return 0; > } I usually write things like that as return pd->ops.power_on ? pd->ops.power_on() : 0; That gets the job done in just one line of code instead of 4 and in one statement instead of 3. Thanks, Rafael