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_afflvl_off.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'common/psci/psci_afflvl_off.c') diff --git a/common/psci/psci_afflvl_off.c b/common/psci/psci_afflvl_off.c index fea2b7e8..b62ae295 100644 --- a/common/psci/psci_afflvl_off.c +++ b/common/psci/psci_afflvl_off.c @@ -91,13 +91,6 @@ static int psci_afflvl0_off(unsigned long mpidr, aff_map_node *cpu_node) plat_state); } - /* - * The only error cpu_off can return is E_DENIED. So check if that's - * indeed the case. The caller will simply 'eret' in case of an error. - */ - if (rc != PSCI_E_SUCCESS) - assert(rc == PSCI_E_DENIED); - return rc; } @@ -123,7 +116,7 @@ static int psci_afflvl1_off(unsigned long mpidr, aff_map_node *cluster_node) dcsw_op_all(DCCISW); /* - * Plat. Management. Allow the platform to do it's cluster + * Plat. Management. Allow the platform to do its cluster * specific bookeeping e.g. turn off interconnect coherency, * program the power controller etc. */ @@ -152,7 +145,7 @@ static int psci_afflvl2_off(unsigned long mpidr, aff_map_node *system_node) /* No arch. and generic bookeeping to do here currently */ /* - * Plat. Management : Allow the platform to do it's bookeeping + * Plat. Management : Allow the platform to do its bookeeping * at this affinity level */ if (psci_plat_pm_ops->affinst_off) -- cgit