aboutsummaryrefslogtreecommitdiff
path: root/common/psci/psci_setup.c
diff options
context:
space:
mode:
authorJames Morrissey <james.morrissey@arm.com>2014-02-10 14:24:36 +0000
committerDan Handley <dan.handley@arm.com>2014-02-17 18:51:43 +0000
commit40a6f64795847f2b96ec24e9b11cb7002f0b48bf (patch)
tree114e57eca37970dddbb35e33538f7a75da515ca5 /common/psci/psci_setup.c
parentdf64a55b3a675a61b88bb4d0a357ba7085000cdc (diff)
downloadarm-trusted-firmware-40a6f64795847f2b96ec24e9b11cb7002f0b48bf.tar.gz
Fix asserts appearing in release builds
Also fix warnings generated in release builds when assert code is absent. Change-Id: I45b9173d3888f9e93e98eb5b4fdc06727ba5cbf4
Diffstat (limited to 'common/psci/psci_setup.c')
-rw-r--r--common/psci/psci_setup.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/common/psci/psci_setup.c b/common/psci/psci_setup.c
index c0d29f2..4c32b41 100644
--- a/common/psci/psci_setup.c
+++ b/common/psci/psci_setup.c
@@ -255,7 +255,7 @@ static unsigned int psci_init_aff_map(unsigned long mpidr,
******************************************************************************/
void psci_setup(unsigned long mpidr)
{
- int afflvl, affmap_idx, rc, max_afflvl;
+ int afflvl, affmap_idx, max_afflvl;
aff_map_node *node;
/* Initialize psci's internal state */
@@ -314,8 +314,7 @@ void psci_setup(unsigned long mpidr)
psci_set_state(node, PSCI_STATE_ON);
}
- rc = platform_setup_pm(&psci_plat_pm_ops);
- assert(rc == 0);
+ platform_setup_pm(&psci_plat_pm_ops);
assert(psci_plat_pm_ops);
return;