From 3140a9e5c7d524eb1ea1648ae7c26e61fe7d740c Mon Sep 17 00:00:00 2001 From: Achin Gupta Date: Mon, 2 Dec 2013 16:23:12 +0000 Subject: psci: rework cpu_off assertion and minor cleanups This patch: 1. removes a duplicate assertion to check that the only error condition that can be returned while turning a cpu off is PSCI_E_DENIED. Having this assertion after calling psci_afflvl_off() is sufficient. 2. corrects some incorrect usage of 'its' vs 'it is' 3. removes some unwanted white spaces Change-Id: Icf014e269b54f5be5ce0b9fbe6b41258e4ebf403 --- common/psci/psci_main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'common/psci/psci_main.c') diff --git a/common/psci/psci_main.c b/common/psci/psci_main.c index b1aa8997..fbf864bc 100644 --- a/common/psci/psci_main.c +++ b/common/psci/psci_main.c @@ -122,9 +122,11 @@ int psci_cpu_off(void) */ rc = psci_afflvl_off(mpidr, target_afflvl, MPIDR_AFFLVL0); - if (rc != PSCI_E_SUCCESS) { - assert(rc == PSCI_E_DENIED); - } + /* + * The only error cpu_off can return is E_DENIED. So check if that's + * indeed the case. + */ + assert (rc == PSCI_E_SUCCESS || rc == PSCI_E_DENIED); return rc; } -- cgit v1.2.3