Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752194AbdGEQiw (ORCPT ); Wed, 5 Jul 2017 12:38:52 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:55135 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751987AbdGEQit (ORCPT ); Wed, 5 Jul 2017 12:38:49 -0400 From: "Gautham R. Shenoy" To: Michael Ellerman , Michael Neuling , Nicholas Piggin , Vaidyanathan Srinivasan , Shilpasri G Bhat , "Rafael J. Wysocki" , Akshay Adiga Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, "Gautham R. Shenoy" Subject: [PATCH 2/5] powernv:idle: Change return type of pnv_probe_idle_states to int Date: Wed, 5 Jul 2017 22:08:13 +0530 X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1499272696-28751-1-git-send-email-ego@linux.vnet.ibm.com> References: <1499272696-28751-1-git-send-email-ego@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 17070516-2213-0000-0000-000001F1645B X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00007324; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000214; SDB=6.00883263; UDB=6.00440614; IPR=6.00663454; BA=6.00005454; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00016094; XFM=3.00000015; UTC=2017-07-05 16:38:34 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17070516-2214-0000-0000-000056C372A4 Message-Id: <1499272696-28751-3-git-send-email-ego@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-07-05_10:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1707050280 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2270 Lines: 76 From: "Gautham R. Shenoy" In the current idle initialization code, if there are failures in pnv_probe_idle_states, then no platform idle state is enabled. However, since the error is not propagated to the top-level function pnv_init_idle_states, we continue initialization in this top-level function even though this will never be used. Hence change the the return type of pnv_probe_idle_states from void to int and in case of failures, bail out early on in pnv_init_idle_states. Signed-off-by: Gautham R. Shenoy --- arch/powerpc/platforms/powernv/idle.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/platforms/powernv/idle.c b/arch/powerpc/platforms/powernv/idle.c index b747bb5..a5990d9 100644 --- a/arch/powerpc/platforms/powernv/idle.c +++ b/arch/powerpc/platforms/powernv/idle.c @@ -813,26 +813,27 @@ static int __init pnv_idle_parse(struct device_node *np, int dt_idle_states) /* * Probe device tree for supported idle states */ -static void __init pnv_probe_idle_states(void) +static int __init pnv_probe_idle_states(void) { struct device_node *np; int dt_idle_states; - int i; + int i, rc; np = of_find_node_by_path("/ibm,opal/power-mgt"); if (!np) { pr_warn("opal: PowerMgmt Node not found\n"); - return; + return -ENODEV; } dt_idle_states = of_property_count_u32_elems(np, "ibm,cpu-idle-state-flags"); if (dt_idle_states < 0) { pr_warn("cpuidle-powernv: no idle states found in the DT\n"); - return; + return -ENOENT; } - if (pnv_idle_parse(np, dt_idle_states)) - return; + rc = pnv_idle_parse(np, dt_idle_states); + if (rc) + return rc; if (cpu_has_feature(CPU_FTR_ARCH_300)) pnv_power9_idle_init(); @@ -842,6 +843,8 @@ static void __init pnv_probe_idle_states(void) continue; supported_cpuidle_states |= pnv_idle.states[i].flags; } + + return 0; } static int __init pnv_init_idle_states(void) @@ -852,7 +855,8 @@ static int __init pnv_init_idle_states(void) if (cpuidle_disable != IDLE_NO_OVERRIDE) goto out; - pnv_probe_idle_states(); + if (pnv_probe_idle_states()) + goto out; if (!(supported_cpuidle_states & OPAL_PM_SLEEP_ENABLED_ER1)) { patch_instruction( -- 1.9.4