Fix asserts appearing in release builds
Also fix warnings generated in release builds when assert code
is absent.
Change-Id: I45b9173d3888f9e93e98eb5b4fdc06727ba5cbf4
diff --git a/common/psci/psci_common.c b/common/psci/psci_common.c
index e6be2f8..193655d 100644
--- a/common/psci/psci_common.c
+++ b/common/psci/psci_common.c
@@ -37,6 +37,7 @@
#include <psci.h>
#include <psci_private.h>
#include <runtime_svc.h>
+#include "debug.h"
/*******************************************************************************
* Arrays that contains information needs to resume a cpu's execution when woken
@@ -511,7 +512,8 @@
start_afflvl,
end_afflvl,
mpidr_nodes);
- assert (rc == PSCI_E_SUCCESS);
+ if (rc != PSCI_E_SUCCESS)
+ panic();
/*
* This function acquires the lock corresponding to each affinity
@@ -529,7 +531,8 @@
end_afflvl,
pon_handlers,
mpidr);
- assert (rc == PSCI_E_SUCCESS);
+ if (rc != PSCI_E_SUCCESS)
+ panic();
/*
* This loop releases the lock corresponding to each affinity level
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 @@
******************************************************************************/
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 @@
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;