misc: Replace `#if BUILD_X` with `#ifdef`

Build system conditional variables do not set a zero value when not set,
but rather are simply not defined. Relying on a lack of a definition to
evaluate to 0 is potentially unsafe, as it can mask logical errors.

Change-Id: Ic1281fae2da176cad224514f355ff00886abe04c
Signed-off-by: Chris Kay <chris.kay@arm.com>

5 files changed, 16 insertions, 16 deletions

diff --git a/product/juno/module/juno_ppu/src/mod_juno_ppu.c b/product/juno/module/juno_ppu/src/mod_juno_ppu.c
index 784939e7..4cc1f92c 100644
--- a/product/juno/module/juno_ppu/src/mod_juno_ppu.c
+++ b/product/juno/module/juno_ppu/src/mod_juno_ppu.c
@@ -780,7 +780,7 @@ static int juno_ppu_module_init(fwk_id_t module_id,
 
     juno_ppu_ctx.dbgsys_state = MOD_PD_STATE_OFF;
 
-    #if BUILD_HAS_MOD_TIMER
+#ifdef BUILD_HAS_MOD_TIMER
     fwk_assert(data != NULL);
     #endif
 
@@ -833,7 +833,7 @@ static int juno_ppu_bind(fwk_id_t id, unsigned int round)
         return FWK_SUCCESS;
 
     if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) {
-        #if BUILD_HAS_MOD_TIMER
+#ifdef BUILD_HAS_MOD_TIMER
         config = fwk_module_get_data(fwk_module_id_juno_ppu);
 
         status = fwk_module_bind(
@@ -850,7 +850,7 @@ static int juno_ppu_bind(fwk_id_t id, unsigned int round)
     ppu_ctx = juno_ppu_ctx.ppu_ctx_table + fwk_id_get_element_idx(id);
     dev_config = ppu_ctx->config;
 
-    #if BUILD_HAS_MOD_TIMER
+#ifdef BUILD_HAS_MOD_TIMER
     if (!fwk_id_is_equal(dev_config->timer_id, FWK_ID_NONE)) {
         /* Bind to the timer */
         status = fwk_module_bind(dev_config->timer_id,
@@ -863,7 +863,7 @@ static int juno_ppu_bind(fwk_id_t id, unsigned int round)
     if (!fwk_id_is_equal(ppu_ctx->bound_id, FWK_ID_NONE)) {
         /* Bind back to the entity that bound to us (if any) */
         switch (fwk_id_get_module_idx(ppu_ctx->bound_id)) {
-        #if BUILD_HAS_MOD_POWER_DOMAIN
+#ifdef BUILD_HAS_MOD_POWER_DOMAIN
         case FWK_MODULE_IDX_POWER_DOMAIN:
             /* Bind back to the PD module */
             status = fwk_module_bind(ppu_ctx->bound_id,
@@ -874,7 +874,7 @@ static int juno_ppu_bind(fwk_id_t id, unsigned int round)
             break;
         #endif
 
-        #if BUILD_HAS_MOD_SYSTEM_POWER
+#ifdef BUILD_HAS_MOD_SYSTEM_POWER
         case FWK_MODULE_IDX_SYSTEM_POWER:
             /* Bind back to the System Power module */
             status = fwk_module_bind(ppu_ctx->bound_id,
diff --git a/product/juno/scp_ramfw/config_scmi_power_domain.c b/product/juno/scp_ramfw/config_scmi_power_domain.c
index 04a63910..fea8e017 100644
--- a/product/juno/scp_ramfw/config_scmi_power_domain.c
+++ b/product/juno/scp_ramfw/config_scmi_power_domain.c
@@ -14,7 +14,7 @@
 #include <fwk_module.h>
 #include <fwk_module_idx.h>
 
-#if BUILD_HAS_MOD_DEBUG
+#ifdef BUILD_HAS_MOD_DEBUG
 struct fwk_module_config config_scmi_power_domain = {
     .data = &((struct mod_scmi_pd_config) {
         .debug_pd_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_POWER_DOMAIN,
diff --git a/product/n1sdp/module/n1sdp_smt/src/mod_smt.c b/product/n1sdp/module/n1sdp_smt/src/mod_smt.c
index f87e0490..92fca8a0 100644
--- a/product/n1sdp/module/n1sdp_smt/src/mod_smt.c
+++ b/product/n1sdp/module/n1sdp_smt/src/mod_smt.c
@@ -475,7 +475,7 @@ static int smt_start(fwk_id_t id)
 
     ctx = &smt_ctx.channel_ctx_table[fwk_id_get_element_idx(id)];
 
-#if BUILD_HAS_MOD_POWER_DOMAIN
+#ifdef BUILD_HAS_MOD_POWER_DOMAIN
     /* Register for power domain state transition notifications */
     return fwk_notification_subscribe(
         mod_pd_notification_id_power_state_transition,
@@ -493,7 +493,7 @@ static int smt_start(fwk_id_t id)
 #endif
 }
 
-#if BUILD_HAS_MOD_POWER_DOMAIN
+#ifdef BUILD_HAS_MOD_POWER_DOMAIN
 static int smt_process_notification(
     const struct fwk_event *event,
     struct fwk_event *resp_event)
@@ -535,7 +535,7 @@ const struct fwk_module module_n1sdp_smt = {
     .bind = smt_bind,
     .start = smt_start,
     .process_bind_request = smt_process_bind_request,
-#if BUILD_HAS_MOD_POWER_DOMAIN
+#ifdef BUILD_HAS_MOD_POWER_DOMAIN
     .process_notification = smt_process_notification,
 #endif
 };
diff --git a/product/synquacer/module/ppu_v0_synquacer/src/mod_ppu_v0.c b/product/synquacer/module/ppu_v0_synquacer/src/mod_ppu_v0.c
index 998c65fb..3048208b 100644
--- a/product/synquacer/module/ppu_v0_synquacer/src/mod_ppu_v0.c
+++ b/product/synquacer/module/ppu_v0_synquacer/src/mod_ppu_v0.c
@@ -21,7 +21,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#if BUILD_HAS_MOD_SYSTEM_POWER
+#ifdef BUILD_HAS_MOD_SYSTEM_POWER
 #    include <mod_system_power.h>
 #endif
 #include <ppu_v0.h>
@@ -274,7 +274,7 @@ static int ppu_v0_bind(fwk_id_t id, unsigned int round)
         return FWK_SUCCESS;
 
     switch (fwk_id_get_module_idx(pd_ctx->bound_id)) {
-#if BUILD_HAS_MOD_POWER_DOMAIN
+#ifdef BUILD_HAS_MOD_POWER_DOMAIN
     case FWK_MODULE_IDX_POWER_DOMAIN:
         return fwk_module_bind(
             pd_ctx->bound_id,
@@ -283,7 +283,7 @@ static int ppu_v0_bind(fwk_id_t id, unsigned int round)
         break;
 #endif
 
-#if BUILD_HAS_MOD_SYSTEM_POWER
+#ifdef BUILD_HAS_MOD_SYSTEM_POWER
     case FWK_MODULE_IDX_SYSTEM_POWER:
         return fwk_module_bind(
             pd_ctx->bound_id,
@@ -320,14 +320,14 @@ static int ppu_v0_process_bind_request(
     case MOD_PD_TYPE_DEVICE_DEBUG:
     case MOD_PD_TYPE_CLUSTER:
     case MOD_PD_TYPE_CORE:
-#if BUILD_HAS_MOD_POWER_DOMAIN
+#ifdef BUILD_HAS_MOD_POWER_DOMAIN
         if (fwk_id_get_module_idx(source_id) == FWK_MODULE_IDX_POWER_DOMAIN) {
             pd_ctx->bound_id = source_id;
             *api = &pd_driver;
             break;
         }
 #endif
-#if BUILD_HAS_MOD_SYSTEM_POWER
+#ifdef BUILD_HAS_MOD_SYSTEM_POWER
         if (fwk_id_get_module_idx(source_id) == FWK_MODULE_IDX_SYSTEM_POWER) {
             *api = &pd_driver;
             break;
diff --git a/product/synquacer/module/synquacer_pik_clock/src/mod_synquacer_pik_clock.c b/product/synquacer/module/synquacer_pik_clock/src/mod_synquacer_pik_clock.c
index 9e3cc6fb..8d8ba030 100644
--- a/product/synquacer/module/synquacer_pik_clock/src/mod_synquacer_pik_clock.c
+++ b/product/synquacer/module/synquacer_pik_clock/src/mod_synquacer_pik_clock.c
@@ -533,7 +533,7 @@ static const struct mod_clock_drv_api api_clock = {
  * Direct driver API functions
  */
 
-#if BUILD_HAS_MOD_CSS_CLOCK
+#ifdef BUILD_HAS_MOD_CSS_CLOCK
 static int pik_clock_direct_set_div(
     fwk_id_t clock_id,
     uint32_t divider_type,
@@ -718,7 +718,7 @@ static int pik_clock_process_bind_request(
     ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(target_id);
 
     if (ctx->config->is_group_member) {
-#if BUILD_HAS_MOD_CSS_CLOCK
+#ifdef BUILD_HAS_MOD_CSS_CLOCK
         /* Only the CSS Clock module can bind to group members. */
         if (fwk_id_get_module_idx(source_id) == FWK_MODULE_IDX_CSS_CLOCK) {
             *api = &api_direct;