From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3x2mlf6NLMzDqyV for ; Thu, 6 Jul 2017 02:38:38 +1000 (AEST) Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v65GcYt7104159 for ; Wed, 5 Jul 2017 12:38:36 -0400 Received: from e11.ny.us.ibm.com (e11.ny.us.ibm.com [129.33.205.201]) by mx0a-001b2d01.pphosted.com with ESMTP id 2bh39d1jbn-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 05 Jul 2017 12:38:36 -0400 Received: from localhost by e11.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 5 Jul 2017 12:38:35 -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 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> Message-Id: <1499272696-28751-3-git-send-email-ego@linux.vnet.ibm.com> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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