modules: Remove calls to fwk_module_check_call

This change is to reduce memory footprint.

Change-Id: I1d10681b3cdf28520b45a698ed607cca4df39b65
Signed-off-by: Tarek El-Sherbiny <tarek.el-sherbiny@arm.com>

33 files changed, 20 insertions, 622 deletions

diff --git a/module/clock/src/mod_clock.c b/module/clock/src/mod_clock.c
index 0acfb067..b8abdde0 100644
--- a/module/clock/src/mod_clock.c
+++ b/module/clock/src/mod_clock.c
@@ -120,14 +120,8 @@ static int create_async_request(struct clock_dev_ctx *ctx, fwk_id_t clock_id)
 
 static int get_ctx(fwk_id_t clock_id, struct clock_dev_ctx **ctx)
 {
-    int status;
-
     fwk_assert(fwk_module_is_valid_element_id(clock_id));
 
-    status = fwk_module_check_call(clock_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     *ctx = &module_ctx.dev_ctx_table[fwk_id_get_element_idx(clock_id)];
 
     return FWK_SUCCESS;
diff --git a/module/cmn600/src/mod_cmn600.c b/module/cmn600/src/mod_cmn600.c
index 05db6daa..f153262a 100644
--- a/module/cmn600/src/mod_cmn600.c
+++ b/module/cmn600/src/mod_cmn600.c
@@ -495,13 +495,8 @@ static int cmn600_setup(void)
 
 static int cmn600_setup_rnsam(unsigned int node_id)
 {
-    int status;
     unsigned int node_idx;
 
-    status = fwk_module_check_call(FWK_ID_MODULE(FWK_MODULE_IDX_CMN600));
-    if (status != FWK_SUCCESS)
-        return status;
-
     for (node_idx = 0; node_idx < ctx->external_rnsam_count; node_idx++) {
         if (ctx->external_rnsam_table[node_idx].node_id == node_id) {
             cmn600_setup_sam(ctx->external_rnsam_table[node_idx].node);
@@ -533,11 +528,6 @@ static const struct mod_ppu_v1_power_state_observer_api cmn600_observer_api = {
 static int cmn600_ccix_config_get(
     struct mod_cmn600_ccix_host_node_config *config)
 {
-    int status;
-    status = fwk_module_check_call(fwk_module_id_cmn600);
-    if (status != FWK_SUCCESS)
-        return status;
-
     if (ctx->internal_rnsam_count == 0)
         return FWK_E_DATA;
 
@@ -557,9 +547,6 @@ static int cmn600_ccix_config_set(
     unsigned int i;
     int status;
 
-    status = fwk_module_check_call(fwk_module_id_cmn600);
-    if (status != FWK_SUCCESS)
-        return status;
 
     status = ccix_setup(ctx, config);
     if (status != FWK_SUCCESS)
@@ -574,39 +561,17 @@ static int cmn600_ccix_config_set(
 
 static int cmn600_ccix_exchange_protocol_credit(uint8_t link_id)
 {
-    int status;
-
-    status = fwk_module_check_call(fwk_module_id_cmn600);
-    if (status != FWK_SUCCESS)
-        return status;
-
-    status = ccix_exchange_protocol_credit(ctx, link_id);
-    return status;
+    return ccix_exchange_protocol_credit(ctx, link_id);
 }
 
 static int cmn600_ccix_enter_system_coherency(uint8_t link_id)
 {
-    int status;
-
-    status = fwk_module_check_call(fwk_module_id_cmn600);
-    if (status != FWK_SUCCESS)
-        return status;
-
-    status = ccix_enter_system_coherency(ctx, link_id);
-    return status;
+    return ccix_enter_system_coherency(ctx, link_id);
 }
 
 static int cmn600_ccix_enter_dvm_domain(uint8_t link_id)
 {
-    int status;
-
-    status = fwk_module_check_call(fwk_module_id_cmn600);
-    if (status != FWK_SUCCESS)
-        return status;
-
-    status = ccix_enter_dvm_domain(ctx, link_id);
-    return status;
-
+    return ccix_enter_dvm_domain(ctx, link_id);
 }
 
 static const struct mod_cmn600_ccix_config_api cmn600_ccix_config_api = {
diff --git a/module/css_clock/src/mod_css_clock.c b/module/css_clock/src/mod_css_clock.c
index be8459de..54001d40 100644
--- a/module/css_clock/src/mod_css_clock.c
+++ b/module/css_clock/src/mod_css_clock.c
@@ -166,13 +166,8 @@ exit:
 static int css_clock_set_rate(fwk_id_t dev_id, uint64_t rate,
                               enum mod_clock_round_mode round_mode)
 {
-    int status;
     struct css_clock_dev_ctx *ctx;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id);
 
     if (ctx->config->clock_type == MOD_CSS_CLOCK_TYPE_INDEXED)
@@ -183,13 +178,8 @@ static int css_clock_set_rate(fwk_id_t dev_id, uint64_t rate,
 
 static int css_clock_get_rate(fwk_id_t dev_id, uint64_t *rate)
 {
-    int status;
     struct css_clock_dev_ctx *ctx;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id);
     *rate = ctx->current_rate;
 
@@ -200,13 +190,8 @@ static int css_clock_get_rate_from_index(fwk_id_t dev_id,
                                          unsigned int rate_index,
                                          uint64_t *rate)
 {
-    int status;
     struct css_clock_dev_ctx *ctx;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     if (rate == NULL)
         return FWK_E_PARAM;
 
@@ -224,12 +209,6 @@ static int css_clock_get_rate_from_index(fwk_id_t dev_id,
 
 static int css_clock_set_state(fwk_id_t dev_id, enum mod_clock_state state)
 {
-    int status;
-
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     if (state == MOD_CLOCK_STATE_RUNNING)
         return FWK_SUCCESS; /* CSS clocks are always running */
 
@@ -239,12 +218,6 @@ static int css_clock_set_state(fwk_id_t dev_id, enum mod_clock_state state)
 
 static int css_clock_get_state(fwk_id_t dev_id, enum mod_clock_state *state)
 {
-    int status;
-
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     *state = MOD_CLOCK_STATE_RUNNING;
 
     return FWK_SUCCESS;
@@ -252,13 +225,8 @@ static int css_clock_get_state(fwk_id_t dev_id, enum mod_clock_state *state)
 
 static int css_clock_get_range(fwk_id_t dev_id, struct mod_clock_range *range)
 {
-    int status;
     struct css_clock_dev_ctx *ctx;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     if (range == NULL)
         return FWK_E_PARAM;
 
@@ -283,10 +251,6 @@ static int css_clock_power_state_change(
     struct css_clock_dev_ctx *ctx;
     const struct mod_css_clock_dev_config *dev_config;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id);
     dev_config = ctx->config;
 
@@ -329,10 +293,6 @@ static int css_clock_pending_power_state_change(
     struct css_clock_dev_ctx *ctx;
     const struct mod_css_clock_dev_config *dev_config;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id);
     dev_config = ctx->config;
 
diff --git a/module/ddr_phy500/src/mod_ddr_phy500.c b/module/ddr_phy500/src/mod_ddr_phy500.c
index ddb9ecb1..230b5953 100644
--- a/module/ddr_phy500/src/mod_ddr_phy500.c
+++ b/module/ddr_phy500/src/mod_ddr_phy500.c
@@ -36,9 +36,6 @@ static int ddr_phy500_config(fwk_id_t element_id)
     const struct mod_ddr_phy500_module_config *module_config;
     const struct mod_ddr_phy500_element_config *element_config;
 
-    status = fwk_module_check_call(element_id);
-    if (status != FWK_SUCCESS)
-        return status;
 
     module_config = fwk_module_get_data(fwk_module_id_ddr_phy500);
 
diff --git a/module/dvfs/src/mod_dvfs_module.c b/module/dvfs/src/mod_dvfs_module.c
index f23fabbb..e2de6a60 100644
--- a/module/dvfs/src/mod_dvfs_module.c
+++ b/module/dvfs/src/mod_dvfs_module.c
@@ -216,9 +216,6 @@ static int dvfs_process_notification(
 
 struct mod_dvfs_domain_ctx *__mod_dvfs_get_valid_domain_ctx(fwk_id_t domain_id)
 {
-    if (fwk_module_check_call(domain_id) != FWK_SUCCESS)
-        return NULL;
-
     return get_domain_ctx(domain_id);
 }
 
diff --git a/module/dw_apb_i2c/src/mod_dw_apb_i2c.c b/module/dw_apb_i2c/src/mod_dw_apb_i2c.c
index 506d37bb..299d7e94 100644
--- a/module/dw_apb_i2c/src/mod_dw_apb_i2c.c
+++ b/module/dw_apb_i2c/src/mod_dw_apb_i2c.c
@@ -137,9 +137,6 @@ static int transmit_as_master(fwk_id_t dev_id,
     unsigned int sent_bytes;
     struct dw_apb_i2c_ctx *ctx;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
 
     if (transmit_request->transmit_byte_count > I2C_TRANSMIT_BUFFER_LENGTH)
         return FWK_E_SUPPORT;
@@ -178,9 +175,6 @@ static int receive_as_master(fwk_id_t dev_id,
     unsigned int i;
     struct dw_apb_i2c_ctx *ctx;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
 
     if (receive_request->receive_byte_count > I2C_RECEIVE_BUFFER_LENGTH)
         return FWK_E_SUPPORT;
diff --git a/module/gtimer/src/mod_gtimer.c b/module/gtimer/src/mod_gtimer.c
index e4be1d4a..edd70dfb 100644
--- a/module/gtimer/src/mod_gtimer.c
+++ b/module/gtimer/src/mod_gtimer.c
@@ -41,11 +41,6 @@ static struct dev_ctx *ctx_table;
 static int enable(fwk_id_t dev_id)
 {
     struct dev_ctx *ctx;
-    int status;
-
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
 
     ctx = ctx_table + fwk_id_get_element_idx(dev_id);
 
@@ -58,11 +53,6 @@ static int enable(fwk_id_t dev_id)
 static int disable(fwk_id_t dev_id)
 {
     struct dev_ctx *ctx;
-    int status;
-
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
 
     ctx = ctx_table + fwk_id_get_element_idx(dev_id);
 
@@ -75,14 +65,9 @@ static int disable(fwk_id_t dev_id)
 static int get_counter(fwk_id_t dev_id, uint64_t *value)
 {
     const struct dev_ctx *ctx;
-    int status;
     uint32_t counter_low;
     uint32_t counter_high;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     ctx = ctx_table + fwk_id_get_element_idx(dev_id);
 
     /*
@@ -107,10 +92,6 @@ static int set_timer(fwk_id_t dev_id, uint64_t timestamp)
     uint64_t counter;
     int status;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     status = get_counter(dev_id, &counter);
     if (status != FWK_SUCCESS)
         return status;
@@ -137,14 +118,9 @@ static int set_timer(fwk_id_t dev_id, uint64_t timestamp)
 static int get_timer(fwk_id_t dev_id, uint64_t *timestamp)
 {
     struct dev_ctx *ctx;
-    int status;
     uint32_t counter_low;
     uint32_t counter_high;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     ctx = ctx_table + fwk_id_get_element_idx(dev_id);
 
     /* Read 64-bit timer value */
@@ -158,16 +134,11 @@ static int get_timer(fwk_id_t dev_id, uint64_t *timestamp)
 
 static int get_frequency(fwk_id_t dev_id, uint32_t *frequency)
 {
-    int status;
     struct dev_ctx *ctx;
 
     if (frequency == NULL)
         return FWK_E_PARAM;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     ctx = ctx_table + fwk_id_get_element_idx(dev_id);
 
     *frequency = ctx->config->frequency;
diff --git a/module/i2c/src/mod_i2c.c b/module/i2c/src/mod_i2c.c
index 63f23291..c3ddc784 100644
--- a/module/i2c/src/mod_i2c.c
+++ b/module/i2c/src/mod_i2c.c
@@ -44,17 +44,11 @@ static const fwk_id_t mod_i2c_event_id_request_completed = FWK_ID_EVENT_INIT(
 /*
  * Static helpers
  */
-static int get_ctx(fwk_id_t id, struct mod_i2c_dev_ctx **ctx)
+static void get_ctx(fwk_id_t id, struct mod_i2c_dev_ctx **ctx)
 {
-    int status;
-
-    status = fwk_module_check_call(id);
-    if (status != FWK_SUCCESS)
-        return FWK_E_PARAM;
+    fwk_assert(fwk_module_is_valid_element_id(id));
 
     *ctx = ctx_table + fwk_id_get_element_idx(id);
-
-    return FWK_SUCCESS;
 }
 
 static int create_i2c_request(fwk_id_t dev_id,
@@ -66,11 +60,7 @@ static int create_i2c_request(fwk_id_t dev_id,
     struct mod_i2c_request *event_param =
         (struct mod_i2c_request *)event.params;
 
-    fwk_assert(fwk_module_is_valid_element_id(dev_id));
-
-    status = get_ctx(dev_id, &ctx);
-    if (status != FWK_SUCCESS)
-        return status;
+    get_ctx(dev_id, &ctx);
 
     /* The slave address should be on 7 bits */
     if (!fwk_expect(request->slave_address < 0x80))
@@ -343,17 +333,14 @@ static int respond_to_caller(int event_status,
 static int mod_i2c_process_event(const struct fwk_event *event,
                                  struct fwk_event *resp_event)
 {
-    int status, drv_status;
+    int status = FWK_E_PARAM;
+    int drv_status;
     struct mod_i2c_dev_ctx *ctx;
     struct mod_i2c_event_param *event_param =
         (struct mod_i2c_event_param *)event->params;
     struct mod_i2c_request *request = (struct mod_i2c_request *)event->params;
 
-    fwk_assert(fwk_module_is_valid_element_id(event->target_id));
-
-    status = get_ctx(event->target_id, &ctx);
-    if (status != FWK_SUCCESS)
-        return status;
+    get_ctx(event->target_id, &ctx);
 
     switch (fwk_id_get_event_idx(event->id)) {
     case MOD_I2C_EVENT_IDX_REQUEST_TRANSMIT:
diff --git a/module/log/src/mod_log.c b/module/log/src/mod_log.c
index 60bd74bd..2c14a7f6 100644
--- a/module/log/src/mod_log.c
+++ b/module/log/src/mod_log.c
@@ -218,9 +218,6 @@ static int do_log(enum mod_log_group group, const char *fmt, ...)
     if (log_driver == NULL)
         return FWK_E_STATE;
 
-    status = fwk_module_check_call(FWK_ID_MODULE(FWK_MODULE_IDX_LOG));
-    if (status != FWK_SUCCESS)
-        return status;
 
     if (!is_valid_group(group))
         return FWK_E_PARAM;
@@ -248,9 +245,6 @@ static int do_flush(void)
     if (log_driver == NULL)
         return FWK_E_STATE;
 
-    status = fwk_module_check_call(FWK_ID_MODULE(FWK_MODULE_IDX_LOG));
-    if (status != FWK_SUCCESS)
-        return status;
 
     status = log_driver->flush(log_config->device_id);
     if (status != FWK_SUCCESS)
diff --git a/module/mhu/src/mod_mhu.c b/module/mhu/src/mod_mhu.c
index 3e4169eb..4666161d 100644
--- a/module/mhu/src/mod_mhu.c
+++ b/module/mhu/src/mod_mhu.c
@@ -107,14 +107,10 @@ static void mhu_isr(void)
 
 static int raise_interrupt(fwk_id_t slot_id)
 {
-    int status;
     struct mhu_device_ctx *device_ctx;
     unsigned int slot;
     struct mhu_reg *reg;
 
-    status = fwk_module_check_call(slot_id);
-    if (status != FWK_SUCCESS)
-        return status;
 
     device_ctx = &mhu_ctx.device_ctx_table[fwk_id_get_element_idx(slot_id)];
     slot = fwk_id_get_sub_element_idx(slot_id);
diff --git a/module/mhu2/src/mod_mhu2.c b/module/mhu2/src/mod_mhu2.c
index b7403708..7e025a6c 100644
--- a/module/mhu2/src/mod_mhu2.c
+++ b/module/mhu2/src/mod_mhu2.c
@@ -90,15 +90,10 @@ static void mhu2_isr(uintptr_t ctx_param)
 
 static int raise_interrupt(fwk_id_t slot_id)
 {
-    int status;
     unsigned int slot;
     struct mhu2_channel_ctx *channel_ctx;
     struct mhu2_send_reg *send;
 
-    status = fwk_module_check_call(slot_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     channel_ctx = &ctx.channel_ctx_table[fwk_id_get_element_idx(slot_id)];
     slot = fwk_id_get_sub_element_idx(slot_id);
     send = channel_ctx->send;
diff --git a/module/mock_psu/src/mod_mock_psu.c b/module/mock_psu/src/mod_mock_psu.c
index 09c041e0..b43b98f2 100644
--- a/module/mock_psu/src/mod_mock_psu.c
+++ b/module/mock_psu/src/mod_mock_psu.c
@@ -60,31 +60,14 @@ static struct mod_mock_psu_element_ctx *mod_mock_psu_get_ctx(
     return &mod_mock_psu_ctx.elements[element_idx];
 }
 
-static int mod_mock_psu_check_call(fwk_id_t element_id)
-{
-    int status = FWK_E_PARAM;
-
-    if (fwk_id_get_module_idx(element_id) != FWK_MODULE_IDX_MOCK_PSU)
-        goto exit;
-
-    status = fwk_module_check_call(element_id);
-    if (status != FWK_SUCCESS)
-        status = FWK_E_STATE;
-
-exit:
-    return status;
-}
 
 static int mod_mock_psu_get_cfg_ctx(
     fwk_id_t element_id,
     const struct mod_mock_psu_element_cfg **cfg,
     struct mod_mock_psu_element_ctx **ctx)
 {
-    int status;
-
-    status = mod_mock_psu_check_call(element_id);
-    if (status != FWK_SUCCESS)
-        goto exit;
+    if (fwk_id_get_module_idx(element_id) != FWK_MODULE_IDX_MOCK_PSU)
+        return FWK_E_PARAM;
 
     if (ctx != NULL)
         *ctx = mod_mock_psu_get_ctx(element_id);
@@ -92,8 +75,7 @@ static int mod_mock_psu_get_cfg_ctx(
     if (cfg != NULL)
         *cfg = fwk_module_get_data(element_id);
 
-exit:
-    return status;
+    return FWK_SUCCESS;
 }
 
 static void mod_mock_psu_alarm_callback(uintptr_t element_idx)
diff --git a/module/mock_sensor/src/mod_mock_sensor.c b/module/mock_sensor/src/mod_mock_sensor.c
index bbd72f42..3a1b65b6 100644
--- a/module/mock_sensor/src/mod_mock_sensor.c
+++ b/module/mock_sensor/src/mod_mock_sensor.c
@@ -39,14 +39,9 @@ static void mock_sensor_callback(uintptr_t param)
 
 static int get_value(fwk_id_t id, uint64_t *value)
 {
-    int status;
     unsigned int sensor_hal_idx;
     const struct mod_mock_sensor_dev_config *config;
 
-    status = fwk_module_check_call(id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     config = fwk_module_get_data(id);
 
     sensor_hal_idx = fwk_id_get_element_idx(config->sensor_hal_id);
@@ -64,13 +59,8 @@ static int get_value(fwk_id_t id, uint64_t *value)
 
 static int get_info(fwk_id_t id, struct mod_sensor_info *info)
 {
-    int status;
     const struct mod_mock_sensor_dev_config *config;
 
-    status = fwk_module_check_call(id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     config = fwk_module_get_data(id);
 
     if ((info == NULL) || (config == NULL))
diff --git a/module/pik_clock/src/mod_pik_clock.c b/module/pik_clock/src/mod_pik_clock.c
index 9f7a1e8f..17689c87 100644
--- a/module/pik_clock/src/mod_pik_clock.c
+++ b/module/pik_clock/src/mod_pik_clock.c
@@ -337,13 +337,8 @@ exit:
 static int pik_clock_set_rate(fwk_id_t dev_id, uint64_t rate,
                               enum mod_clock_round_mode round_mode)
 {
-    int status;
     struct pik_clock_dev_ctx *ctx;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id);
 
     if (!ctx->initialized)
@@ -357,13 +352,8 @@ static int pik_clock_set_rate(fwk_id_t dev_id, uint64_t rate,
 
 static int pik_clock_get_rate(fwk_id_t dev_id, uint64_t *rate)
 {
-    int status;
     struct pik_clock_dev_ctx *ctx;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     if (rate == NULL)
         return FWK_E_PARAM;
 
@@ -383,13 +373,8 @@ static int pik_clock_get_rate_from_index(fwk_id_t dev_id,
                                          unsigned int rate_index,
                                          uint64_t *rate)
 {
-    int status;
     struct pik_clock_dev_ctx *ctx;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     if (rate == NULL)
         return FWK_E_PARAM;
 
@@ -410,9 +395,6 @@ static int pik_clock_set_state(
     struct pik_clock_dev_ctx *ctx;
     struct mod_pik_clock_rate *rate_entry;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
 
     ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id);
 
@@ -435,7 +417,7 @@ static int pik_clock_set_state(
         status = msclock_set_source(ctx, MOD_PIK_CLOCK_MSCLOCK_SOURCE_GATED,
             false);
         if (status == FWK_SUCCESS)
-          ctx->current_source = MOD_PIK_CLOCK_MSCLOCK_SOURCE_GATED;
+            ctx->current_source = MOD_PIK_CLOCK_MSCLOCK_SOURCE_GATED;
 
         return status;
     } else {
@@ -454,13 +436,8 @@ static int pik_clock_set_state(
 
 static int pik_clock_get_state(fwk_id_t dev_id, enum mod_clock_state *state)
 {
-    int status;
     struct pik_clock_dev_ctx *ctx;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id);
 
     if (ctx->config->type == MOD_PIK_CLOCK_TYPE_SINGLE_SOURCE) {
@@ -486,13 +463,8 @@ static int pik_clock_get_state(fwk_id_t dev_id, enum mod_clock_state *state)
 
 static int pik_clock_get_range(fwk_id_t dev_id, struct mod_clock_range *range)
 {
-    int status;
     struct pik_clock_dev_ctx *ctx;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     if (range == NULL)
         return FWK_E_PARAM;
 
@@ -510,13 +482,8 @@ static int pik_clock_power_state_change(
     fwk_id_t dev_id,
     unsigned int state)
 {
-    int status;
     struct pik_clock_dev_ctx *ctx;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id);
 
     if (ctx->config->is_group_member)
@@ -561,10 +528,6 @@ static int pik_clock_direct_set_div(fwk_id_t clock_id, uint32_t divider_type,
     int status;
     struct pik_clock_dev_ctx *ctx;
 
-    status = fwk_module_check_call(clock_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(clock_id);
     assert(ctx->config->is_group_member);
 
@@ -589,13 +552,8 @@ static int pik_clock_direct_set_div(fwk_id_t clock_id, uint32_t divider_type,
 
 static int pik_clock_direct_set_source(fwk_id_t clock_id, uint8_t source)
 {
-    int status;
     struct pik_clock_dev_ctx *ctx;
 
-    status = fwk_module_check_call(clock_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(clock_id);
     assert(ctx->config->is_group_member);
 
@@ -608,13 +566,8 @@ static int pik_clock_direct_set_source(fwk_id_t clock_id, uint8_t source)
 static int pik_clock_direct_set_mod(fwk_id_t clock_id, uint32_t numerator,
                                     uint32_t denominator)
 {
-    int status;
     struct pik_clock_dev_ctx *ctx;
 
-    status = fwk_module_check_call(clock_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(clock_id);
     assert(ctx->config->is_group_member);
 
@@ -628,13 +581,8 @@ static int pik_clock_direct_power_state_change(
     fwk_id_t dev_id,
     unsigned int state)
 {
-    int status;
     struct pik_clock_dev_ctx *ctx;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id);
 
     if (!ctx->config->is_group_member)
diff --git a/module/pl011/src/mod_pl011.c b/module/pl011/src/mod_pl011.c
index 837a2029..794fe0ef 100644
--- a/module/pl011/src/mod_pl011.c
+++ b/module/pl011/src/mod_pl011.c
@@ -88,13 +88,8 @@ static int set_baud_rate(unsigned int baud_rate_bps, uint64_t clock_rate_hz,
 
 static int do_putchar(fwk_id_t device_id, char c)
 {
-    int status;
     struct pl011_reg *reg;
 
-    status = fwk_module_check_call(device_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     reg = get_device_reg(device_id);
 
     while (reg->FR & PL011_FR_TXFF)
@@ -107,13 +102,8 @@ static int do_putchar(fwk_id_t device_id, char c)
 
 static int do_flush(fwk_id_t device_id)
 {
-    int status;
     struct pl011_reg *reg;
 
-    status = fwk_module_check_call(device_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     reg = get_device_reg(device_id);
 
     while (reg->FR & PL011_FR_BUSY)
diff --git a/module/power_domain/src/mod_power_domain.c b/module/power_domain/src/mod_power_domain.c
index 53048ebb..2e917ba8 100644
--- a/module/power_domain/src/mod_power_domain.c
+++ b/module/power_domain/src/mod_power_domain.c
@@ -1232,13 +1232,8 @@ static void process_system_shutdown_request(
 /* Functions common to the public and restricted API */
 static int pd_get_domain_type(fwk_id_t pd_id, enum mod_pd_type *type)
 {
-    int status;
     struct pd_ctx *pd;
 
-    status = fwk_module_check_call(pd_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     if (type == NULL)
         return FWK_E_PARAM;
 
@@ -1254,13 +1249,8 @@ static int pd_get_domain_type(fwk_id_t pd_id, enum mod_pd_type *type)
 
 static int pd_get_domain_parent_id(fwk_id_t pd_id, fwk_id_t *parent_pd_id)
 {
-    int status;
     const struct pd_ctx *pd;
 
-    status = fwk_module_check_call(pd_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     if (parent_pd_id == NULL)
         return FWK_E_PARAM;
 
@@ -1288,10 +1278,6 @@ static int pd_set_state(fwk_id_t pd_id, unsigned int state)
     struct pd_set_state_response *resp_params =
         (struct pd_set_state_response *)(&resp.params);
 
-    status = fwk_module_check_call(pd_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     pd = &mod_pd_ctx.pd_ctx_table[fwk_id_get_element_idx(pd_id)];
 
     if (!is_valid_state(pd, state))
@@ -1317,17 +1303,12 @@ static int pd_set_state(fwk_id_t pd_id, unsigned int state)
 static int pd_set_state_async(fwk_id_t pd_id,
                               bool response_requested, unsigned int state)
 {
-    int status;
     struct pd_ctx *pd;
     enum mod_pd_level level;
     struct fwk_event req;
     struct pd_set_state_request *req_params =
         (struct pd_set_state_request *)(&req.params);
 
-    status = fwk_module_check_call(pd_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     pd = &mod_pd_ctx.pd_ctx_table[fwk_id_get_element_idx(pd_id)];
 
     if (!is_valid_state(pd, state))
@@ -1359,10 +1340,6 @@ static int pd_set_composite_state(fwk_id_t pd_id, uint32_t composite_state)
     struct pd_set_state_response *resp_params =
         (struct pd_set_state_response *)(&resp.params);
 
-    status = fwk_module_check_call(pd_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     pd = &mod_pd_ctx.pd_ctx_table[fwk_id_get_element_idx(pd_id)];
 
     if (!is_valid_composite_state(pd, composite_state))
@@ -1387,16 +1364,11 @@ static int pd_set_composite_state_async(fwk_id_t pd_id,
                                         bool response_requested,
                                         uint32_t composite_state)
 {
-    int status;
     struct pd_ctx *pd;
     struct fwk_event req;
     struct pd_set_state_request *req_params =
                                (struct pd_set_state_request *)(&req.params);
 
-    status = fwk_module_check_call(pd_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     pd = &mod_pd_ctx.pd_ctx_table[fwk_id_get_element_idx(pd_id)];
 
     if (!is_valid_composite_state(pd, composite_state))
@@ -1424,10 +1396,6 @@ static int pd_get_state(fwk_id_t pd_id, unsigned int *state)
     struct pd_get_state_response *resp_params =
         (struct pd_get_state_response *)(&resp.params);
 
-    status = fwk_module_check_call(pd_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     if (state == NULL)
         return FWK_E_PARAM;
 
@@ -1460,10 +1428,6 @@ static int pd_get_composite_state(fwk_id_t pd_id, unsigned int *composite_state)
     struct pd_get_state_response *resp_params =
         (struct pd_get_state_response *)(&resp.params);
 
-    status = fwk_module_check_call(pd_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     if (composite_state == NULL)
         return FWK_E_PARAM;
 
@@ -1493,10 +1457,6 @@ static int pd_reset(fwk_id_t pd_id)
     struct fwk_event resp;
     struct pd_response *resp_params = (struct pd_response *)(&resp.params);
 
-    status = fwk_module_check_call(pd_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     req = (struct fwk_event) {
         .id = FWK_ID_EVENT(FWK_MODULE_IDX_POWER_DOMAIN, PD_EVENT_IDX_RESET),
         .target_id = pd_id,
@@ -1518,10 +1478,6 @@ static int pd_system_suspend(unsigned int state)
         (struct pd_system_suspend_request *)(&req.params);
     struct pd_response *resp_params = (struct pd_response *)(&resp.params);
 
-    status = fwk_module_check_call(fwk_module_id_power_domain);
-    if (status != FWK_SUCCESS)
-        return status;
-
     req = (struct fwk_event) {
         .id = FWK_ID_EVENT(FWK_MODULE_IDX_POWER_DOMAIN,
                            PD_EVENT_IDX_SYSTEM_SUSPEND),
@@ -1546,10 +1502,6 @@ static int pd_system_shutdown(enum mod_pd_system_shutdown system_shutdown)
         (struct pd_system_shutdown_request *)(&req.params);
     struct pd_response *resp_params = (struct pd_response *)(&resp.params);
 
-    status = fwk_module_check_call(fwk_module_id_power_domain);
-    if (status != FWK_SUCCESS)
-        return status;
-
     req = (struct fwk_event) {
         .id = FWK_ID_EVENT(FWK_MODULE_IDX_POWER_DOMAIN,
                            PD_EVENT_IDX_SYSTEM_SHUTDOWN),
@@ -1569,14 +1521,9 @@ static int pd_system_shutdown(enum mod_pd_system_shutdown system_shutdown)
 
 static int pd_reset_async(fwk_id_t pd_id, bool response_requested)
 {
-    int status;
     struct fwk_event req;
     struct pd_ctx *pd;
 
-    status = fwk_module_check_call(pd_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     pd = &mod_pd_ctx.pd_ctx_table[fwk_id_get_element_idx(pd_id)];
 
     req = (struct fwk_event) {
@@ -1609,14 +1556,8 @@ static int report_power_state_transition(const struct pd_ctx *pd,
 
 static int pd_report_power_state_transition(fwk_id_t pd_id, unsigned int state)
 {
-    int status;
-    const struct pd_ctx *pd;
-
-    status = fwk_module_check_call(pd_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
-    pd = &mod_pd_ctx.pd_ctx_table[fwk_id_get_element_idx(pd_id)];
+    const struct pd_ctx *pd =
+                        &mod_pd_ctx.pd_ctx_table[fwk_id_get_element_idx(pd_id)];
 
     return report_power_state_transition(pd, state);
 }
diff --git a/module/ppu_v0/src/mod_ppu_v0.c b/module/ppu_v0/src/mod_ppu_v0.c
index ac565d56..26c8ae97 100644
--- a/module/ppu_v0/src/mod_ppu_v0.c
+++ b/module/ppu_v0/src/mod_ppu_v0.c
@@ -103,10 +103,6 @@ static int pd_set_state(fwk_id_t pd_id, unsigned int state)
     int status;
     struct ppu_v0_pd_ctx *pd_ctx;
 
-    status = fwk_module_check_call(pd_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     pd_ctx = ppu_v0_ctx.pd_ctx_table + fwk_id_get_element_idx(pd_id);
 
     fwk_assert(pd_ctx->pd_driver_input_api != NULL);
@@ -137,13 +133,8 @@ static int pd_set_state(fwk_id_t pd_id, unsigned int state)
 
 static int pd_get_state(fwk_id_t pd_id, unsigned int *state)
 {
-    int status;
     struct ppu_v0_pd_ctx *pd_ctx;
 
-    status = fwk_module_check_call(pd_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     pd_ctx = ppu_v0_ctx.pd_ctx_table + fwk_id_get_element_idx(pd_id);
 
     return get_state(pd_ctx->ppu, state);
@@ -154,10 +145,6 @@ static int pd_reset(fwk_id_t pd_id)
     int status;
     struct ppu_v0_pd_ctx *pd_ctx;
 
-    status = fwk_module_check_call(pd_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     pd_ctx = ppu_v0_ctx.pd_ctx_table + fwk_id_get_element_idx(pd_id);
 
     /* Model does not support warm reset at the moment. Using OFF instead. */
diff --git a/module/ppu_v1/src/mod_ppu_v1.c b/module/ppu_v1/src/mod_ppu_v1.c
index 7684999b..7a35a9b6 100644
--- a/module/ppu_v1/src/mod_ppu_v1.c
+++ b/module/ppu_v1/src/mod_ppu_v1.c
@@ -130,10 +130,6 @@ static int ppu_v1_pd_set_state(fwk_id_t pd_id, unsigned int state)
     int status;
     struct ppu_v1_pd_ctx *pd_ctx;
 
-    status = fwk_module_check_call(pd_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     pd_ctx = ppu_v1_ctx.pd_ctx_table + fwk_id_get_element_idx(pd_id);
 
     switch (state) {
@@ -162,13 +158,8 @@ static int ppu_v1_pd_set_state(fwk_id_t pd_id, unsigned int state)
 
 static int ppu_v1_pd_get_state(fwk_id_t pd_id, unsigned int *state)
 {
-    int status;
     struct ppu_v1_pd_ctx *pd_ctx;
 
-    status = fwk_module_check_call(pd_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     pd_ctx = ppu_v1_ctx.pd_ctx_table + fwk_id_get_element_idx(pd_id);
 
     return get_state(pd_ctx->ppu, state);
@@ -179,10 +170,6 @@ static int ppu_v1_pd_reset(fwk_id_t pd_id)
     int status;
     struct ppu_v1_pd_ctx *pd_ctx;
 
-    status = fwk_module_check_call(pd_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     pd_ctx = ppu_v1_ctx.pd_ctx_table + fwk_id_get_element_idx(pd_id);
 
     /* Model does not support warm reset at the moment. Using OFF instead. */
@@ -228,10 +215,6 @@ static int ppu_v1_core_pd_set_state(fwk_id_t core_pd_id, unsigned int state)
     struct ppu_v1_pd_ctx *pd_ctx;
     struct ppu_v1_reg *ppu;
 
-    status = fwk_module_check_call(core_pd_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     pd_ctx = ppu_v1_ctx.pd_ctx_table + fwk_id_get_element_idx(core_pd_id);
     ppu = pd_ctx->ppu;
 
@@ -303,14 +286,9 @@ static int ppu_v1_core_pd_reset(fwk_id_t core_pd_id)
 
 static int ppu_v1_core_pd_prepare_for_system_suspend(fwk_id_t core_pd_id)
 {
-    int status;
     struct ppu_v1_pd_ctx *pd_ctx;
     struct ppu_v1_reg *ppu;
 
-    status = fwk_module_check_call(core_pd_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     pd_ctx = ppu_v1_ctx.pd_ctx_table + fwk_id_get_element_idx(core_pd_id);
     ppu = pd_ctx->ppu;
 
@@ -508,9 +486,6 @@ static int ppu_v1_cluster_pd_set_state(fwk_id_t cluster_pd_id,
     struct ppu_v1_reg *ppu;
     (void)ppu;
 
-    status = fwk_module_check_call(cluster_pd_id);
-    if (status != FWK_SUCCESS)
-        return status;
 
     pd_ctx = ppu_v1_ctx.pd_ctx_table + fwk_id_get_element_idx(cluster_pd_id);
     ppu = pd_ctx->ppu;
@@ -625,13 +600,8 @@ static void ppu_interrupt_handler(uintptr_t pd_ctx_param)
 
 static void ppu_isr_api_interrupt_handler(fwk_id_t pd_id)
 {
-    int status;
     struct ppu_v1_pd_ctx *pd_ctx;
 
-    status = fwk_module_check_call(pd_id);
-    if (status != FWK_SUCCESS)
-        return;
-
     if (!fwk_id_is_type(pd_id, FWK_ID_TYPE_ELEMENT))
         return;
 
@@ -645,13 +615,8 @@ static const struct ppu_v1_isr_api isr_api = {
 
 static int ppu_power_mode_on(fwk_id_t pd_id)
 {
-    int status;
     struct ppu_v1_pd_ctx *pd_ctx;
 
-    status = fwk_module_check_call(pd_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     if (!fwk_id_is_type(pd_id, FWK_ID_TYPE_ELEMENT))
         return FWK_E_PARAM;
 
diff --git a/module/psu/src/mod_psu.c b/module/psu/src/mod_psu.c
index 2a6837d5..89693eb5 100644
--- a/module/psu/src/mod_psu.c
+++ b/module/psu/src/mod_psu.c
@@ -49,31 +49,13 @@ static struct mod_psu_element_ctx *mod_psu_get_element_ctx(fwk_id_t element_id)
     return &mod_psu_ctx.elements[element_idx];
 }
 
-static int mod_psu_check_call(fwk_id_t element_id)
-{
-    int status = FWK_E_PARAM;
-
-    if (fwk_id_get_module_idx(element_id) != FWK_MODULE_IDX_PSU)
-        goto exit;
-
-    status = fwk_module_check_call(element_id);
-    if (status != FWK_SUCCESS)
-        status = FWK_E_STATE;
-
-exit:
-    return status;
-}
-
 static int mod_psu_get_cfg_ctx(
     fwk_id_t element_id,
     const struct mod_psu_element_cfg **cfg,
     struct mod_psu_element_ctx **ctx)
 {
-    int status;
-
-    status = mod_psu_check_call(element_id);
-    if (status != FWK_SUCCESS)
-        goto exit;
+    if (fwk_id_get_module_idx(element_id) != FWK_MODULE_IDX_PSU)
+        return FWK_E_PARAM;
 
     if (ctx != NULL)
         *ctx = mod_psu_get_element_ctx(element_id);
@@ -81,8 +63,7 @@ static int mod_psu_get_cfg_ctx(
     if (cfg != NULL)
         *cfg = fwk_module_get_data(element_id);
 
-exit:
-    return status;
+    return FWK_SUCCESS;
 }
 
 static int mod_psu_get_enabled(fwk_id_t element_id, bool *enabled)
diff --git a/module/reg_sensor/src/mod_reg_sensor.c b/module/reg_sensor/src/mod_reg_sensor.c
index 117dbf74..58bdbbb6 100644
--- a/module/reg_sensor/src/mod_reg_sensor.c
+++ b/module/reg_sensor/src/mod_reg_sensor.c
@@ -21,14 +21,8 @@ static struct mod_reg_sensor_dev_config **config_table;
  */
 static int get_value(fwk_id_t id, uint64_t *value)
 {
-    int status;
     struct mod_reg_sensor_dev_config *config;
 
-    status = fwk_module_check_call(id);
-    if (status != FWK_SUCCESS) {
-        return FWK_E_STATE;
-    }
-
     config = config_table[fwk_id_get_element_idx(id)];
     fwk_assert(config != NULL);
 
@@ -43,13 +37,8 @@ static int get_value(fwk_id_t id, uint64_t *value)
 
 static int get_info(fwk_id_t id, struct mod_sensor_info *info)
 {
-    int status;
     struct mod_reg_sensor_dev_config *config;
 
-    status = fwk_module_check_call(id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     config = config_table[fwk_id_get_element_idx(id)];
     fwk_assert(config != NULL);
 
diff --git a/module/scmi/src/mod_scmi.c b/module/scmi/src/mod_scmi.c
index 11be9fe3..5b36ac2c 100644
--- a/module/scmi/src/mod_scmi.c
+++ b/module/scmi/src/mod_scmi.c
@@ -149,14 +149,7 @@ static uint8_t read_protocol_id(uint32_t message_header)
 
 static int signal_message(fwk_id_t service_id)
 {
-    int32_t status;
-    struct fwk_event event;
-
-    status = fwk_module_check_call(service_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
-    event = (struct fwk_event) {
+    struct fwk_event event = (struct fwk_event) {
         .id = FWK_ID_EVENT(FWK_MODULE_IDX_SCMI, 0),
         .source_id = FWK_ID_MODULE(FWK_MODULE_IDX_SCMI),
         .target_id = service_id,
@@ -175,13 +168,8 @@ static const struct mod_scmi_from_transport_api mod_scmi_from_transport_api = {
 
 static int get_agent_id(fwk_id_t service_id, unsigned int *agent_id)
 {
-    int status;
     struct scmi_service_ctx *ctx;
 
-    status = fwk_module_check_call(service_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     if (agent_id == NULL)
         return FWK_E_PARAM;
 
@@ -207,13 +195,8 @@ static int get_agent_type(uint32_t scmi_agent_id,
 
 static int get_max_payload_size(fwk_id_t service_id, size_t *size)
 {
-    int status;
     struct scmi_service_ctx *ctx;
 
-    status = fwk_module_check_call(service_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     if (size == NULL)
         return FWK_E_PARAM;
 
@@ -225,13 +208,8 @@ static int get_max_payload_size(fwk_id_t service_id, size_t *size)
 static int write_payload(fwk_id_t service_id, size_t offset,
                          const void *payload, size_t size)
 {
-    int status;
     const struct scmi_service_ctx *ctx;
 
-    status = fwk_module_check_call(service_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     ctx = &scmi_ctx.service_ctx_table[fwk_id_get_element_idx(service_id)];
 
     return ctx->transport_api->write_payload(ctx->transport_id,
@@ -243,10 +221,6 @@ static void respond(fwk_id_t service_id, const void *payload, size_t size)
     int status;
     const struct scmi_service_ctx *ctx;
 
-    status = fwk_module_check_call(service_id);
-    if (status != FWK_SUCCESS)
-        return;
-
     ctx = &scmi_ctx.service_ctx_table[fwk_id_get_element_idx(service_id)];
 
     /*
diff --git a/module/scmi_apcore/src/mod_scmi_apcore.c b/module/scmi_apcore/src/mod_scmi_apcore.c
index fd0379c0..02b2f240 100644
--- a/module/scmi_apcore/src/mod_scmi_apcore.c
+++ b/module/scmi_apcore/src/mod_scmi_apcore.c
@@ -318,12 +318,6 @@ exit:
 static int scmi_apcore_get_scmi_protocol_id(fwk_id_t protocol_id,
     uint8_t *scmi_protocol_id)
 {
-    int status;
-
-    status = fwk_module_check_call(protocol_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     *scmi_protocol_id = SCMI_PROTOCOL_ID_APCORE;
 
     return FWK_SUCCESS;
@@ -336,7 +330,6 @@ static int scmi_apcore_message_handler(
     size_t payload_size,
     unsigned int message_id)
 {
-    int status;
     int32_t return_value;
 
     static_assert(FWK_ARRAY_SIZE(handler_table) ==
@@ -344,9 +337,6 @@ static int scmi_apcore_message_handler(
         "[SCMI] Core configuration protocol table sizes not consistent");
     assert(payload != NULL);
 
-    status = fwk_module_check_call(protocol_id);
-    if (status != FWK_SUCCESS)
-        return status;
 
     if (message_id >= FWK_ARRAY_SIZE(handler_table)) {
         return_value = SCMI_NOT_SUPPORTED;
diff --git a/module/scmi_clock/src/mod_scmi_clock.c b/module/scmi_clock/src/mod_scmi_clock.c
index b30d9b37..b9401fc9 100644
--- a/module/scmi_clock/src/mod_scmi_clock.c
+++ b/module/scmi_clock/src/mod_scmi_clock.c
@@ -918,12 +918,6 @@ exit:
 static int scmi_clock_get_scmi_protocol_id(fwk_id_t protocol_id,
                                            uint8_t *scmi_protocol_id)
 {
-    int status;
-
-    status = fwk_module_check_call(protocol_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     *scmi_protocol_id = SCMI_PROTOCOL_ID_CLOCK;
 
     return FWK_SUCCESS;
@@ -932,7 +926,6 @@ static int scmi_clock_get_scmi_protocol_id(fwk_id_t protocol_id,
 static int scmi_clock_message_handler(fwk_id_t protocol_id, fwk_id_t service_id,
     const uint32_t *payload, size_t payload_size, unsigned int message_id)
 {
-    int status;
     int32_t return_value;
 
     static_assert(FWK_ARRAY_SIZE(handler_table) ==
@@ -940,10 +933,6 @@ static int scmi_clock_message_handler(fwk_id_t protocol_id, fwk_id_t service_id,
         "[SCMI] Clock management protocol table sizes not consistent");
     assert(payload != NULL);
 
-    status = fwk_module_check_call(protocol_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     if (message_id >= FWK_ARRAY_SIZE(handler_table)) {
         return_value = SCMI_NOT_SUPPORTED;
         goto error;
diff --git a/module/scmi_perf/src/mod_scmi_perf.c b/module/scmi_perf/src/mod_scmi_perf.c
index 59abfcf7..9edf5786 100644
--- a/module/scmi_perf/src/mod_scmi_perf.c
+++ b/module/scmi_perf/src/mod_scmi_perf.c
@@ -522,12 +522,6 @@ exit:
 static int scmi_perf_get_scmi_protocol_id(fwk_id_t protocol_id,
                                           uint8_t *scmi_protocol_id)
 {
-    int status;
-
-    status = fwk_module_check_call(protocol_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     *scmi_protocol_id = SCMI_PROTOCOL_ID_PERF;
 
     return FWK_SUCCESS;
@@ -536,7 +530,6 @@ static int scmi_perf_get_scmi_protocol_id(fwk_id_t protocol_id,
 static int scmi_perf_message_handler(fwk_id_t protocol_id, fwk_id_t service_id,
     const uint32_t *payload, size_t payload_size, unsigned int message_id)
 {
-    int status;
     int32_t return_value;
 
     static_assert(FWK_ARRAY_SIZE(handler_table) ==
@@ -544,10 +537,6 @@ static int scmi_perf_message_handler(fwk_id_t protocol_id, fwk_id_t service_id,
         "[SCMI] Performance management protocol table sizes not consistent");
     assert(payload != NULL);
 
-    status = fwk_module_check_call(protocol_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     if (message_id >= FWK_ARRAY_SIZE(handler_table)) {
         return_value = SCMI_NOT_SUPPORTED;
         goto error;
diff --git a/module/scmi_power_domain/src/mod_scmi_power_domain.c b/module/scmi_power_domain/src/mod_scmi_power_domain.c
index 441e9677..4338c514 100644
--- a/module/scmi_power_domain/src/mod_scmi_power_domain.c
+++ b/module/scmi_power_domain/src/mod_scmi_power_domain.c
@@ -485,12 +485,6 @@ exit:
 static int scmi_pd_get_scmi_protocol_id(fwk_id_t protocol_id,
                                         uint8_t *scmi_protocol_id)
 {
-    int status;
-
-    status = fwk_module_check_call(protocol_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     *scmi_protocol_id = SCMI_PROTOCOL_ID_POWER_DOMAIN;
 
     return FWK_SUCCESS;
@@ -499,13 +493,8 @@ static int scmi_pd_get_scmi_protocol_id(fwk_id_t protocol_id,
 static int scmi_pd_message_handler(fwk_id_t protocol_id, fwk_id_t service_id,
     const uint32_t *payload, size_t payload_size, unsigned int message_id)
 {
-    int status;
     int32_t return_value;
 
-    status = fwk_module_check_call(protocol_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     static_assert(FWK_ARRAY_SIZE(handler_table) ==
         FWK_ARRAY_SIZE(payload_size_table),
         "[SCMI] Power domain management protocol table sizes not consistent");
diff --git a/module/scmi_sensor/src/mod_scmi_sensor.c b/module/scmi_sensor/src/mod_scmi_sensor.c
index 0d0c27db..fa106316 100644
--- a/module/scmi_sensor/src/mod_scmi_sensor.c
+++ b/module/scmi_sensor/src/mod_scmi_sensor.c
@@ -399,12 +399,6 @@ exit:
 static int scmi_sensor_get_scmi_protocol_id(fwk_id_t protocol_id,
                                             uint8_t *scmi_protocol_id)
 {
-    int status;
-
-    status = fwk_module_check_call(protocol_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     *scmi_protocol_id = SCMI_PROTOCOL_ID_SENSOR;
 
     return FWK_SUCCESS;
@@ -416,13 +410,8 @@ static int scmi_sensor_message_handler(fwk_id_t protocol_id,
                                        size_t payload_size,
                                        unsigned int message_id)
 {
-    int status;
     int32_t return_value;
 
-    status = fwk_module_check_call(protocol_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     static_assert(FWK_ARRAY_SIZE(handler_table) ==
         FWK_ARRAY_SIZE(payload_size_table),
         "[SCMI] Sensor management protocol table sizes not consistent");
diff --git a/module/scmi_system_power/src/mod_scmi_system_power.c b/module/scmi_system_power/src/mod_scmi_system_power.c
index 7540c9df..5eea0d42 100644
--- a/module/scmi_system_power/src/mod_scmi_system_power.c
+++ b/module/scmi_system_power/src/mod_scmi_system_power.c
@@ -326,12 +326,6 @@ exit:
 static int scmi_sys_power_get_scmi_protocol_id(fwk_id_t protocol_id,
                                                uint8_t *scmi_protocol_id)
 {
-    int status;
-
-    status = fwk_module_check_call(protocol_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     *scmi_protocol_id = SCMI_PROTOCOL_ID_SYS_POWER;
 
     return FWK_SUCCESS;
@@ -343,16 +337,12 @@ static int scmi_sys_power_handler(fwk_id_t protocol_id,
                                   size_t payload_size,
                                   unsigned int message_id)
 {
-    int status;
     int32_t return_value;
 
     static_assert(FWK_ARRAY_SIZE(handler_table) ==
                   FWK_ARRAY_SIZE(payload_size_table),
                   "[SCMI] System power protocol table sizes not consistent");
 
-    status = fwk_module_check_call(protocol_id);
-    if (status != FWK_SUCCESS)
-        return status;
     assert(payload != NULL);
 
     if (message_id >= FWK_ARRAY_SIZE(handler_table)) {
diff --git a/module/sds/src/mod_sds.c b/module/sds/src/mod_sds.c
index c7665a29..b9457046 100644
--- a/module/sds/src/mod_sds.c
+++ b/module/sds/src/mod_sds.c
@@ -485,12 +485,6 @@ static int init_sds(void)
 static int sds_struct_write(uint32_t structure_id, unsigned int offset,
                             const void *data, size_t size)
 {
-    int status;
-
-    status = fwk_module_check_call(fwk_module_id_sds);
-    if (status != FWK_SUCCESS)
-        return status;
-
     if (data == NULL)
         return FWK_E_PARAM;
 
@@ -507,9 +501,6 @@ static int sds_struct_read(uint32_t structure_id, unsigned int offset,
     volatile char *structure_base;
     struct structure_header header;
 
-    status = fwk_module_check_call(fwk_module_id_sds);
-    if (status != FWK_SUCCESS)
-        return status;
 
     if (data == NULL)
         return FWK_E_PARAM;
@@ -534,12 +525,6 @@ static int sds_struct_read(uint32_t structure_id, unsigned int offset,
 
 static int sds_struct_finalize(uint32_t structure_id)
 {
-    int status;
-
-    status = fwk_module_check_call(fwk_module_id_sds);
-    if (status != FWK_SUCCESS)
-        return status;
-
     return struct_finalize(structure_id);
 }
 
diff --git a/module/sensor/src/mod_sensor.c b/module/sensor/src/mod_sensor.c
index b5ba9b2b..0faab78d 100644
--- a/module/sensor/src/mod_sensor.c
+++ b/module/sensor/src/mod_sensor.c
@@ -21,17 +21,11 @@ static int get_ctx_if_valid_call(fwk_id_t id,
                                  void *data,
                                  struct sensor_dev_ctx **ctx)
 {
-    int status;
-
     fwk_assert(ctx != NULL);
 
     if (!fwk_expect(data != NULL))
         return FWK_E_PARAM;
 
-    status = fwk_module_check_call(id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     *ctx = ctx_table + fwk_id_get_element_idx(id);
 
     return FWK_SUCCESS;
diff --git a/module/smt/src/mod_smt.c b/module/smt/src/mod_smt.c
index e0e8dde6..a97e69db 100644
--- a/module/smt/src/mod_smt.c
+++ b/module/smt/src/mod_smt.c
@@ -70,15 +70,8 @@ static struct smt_ctx smt_ctx;
  */
 static int smt_get_secure(fwk_id_t channel_id, bool *secure)
 {
-    int status;
     struct smt_channel_ctx *channel_ctx;
 
-    status = fwk_module_check_call(channel_id);
-    if (status != FWK_SUCCESS) {
-        assert(false);
-        return status;
-    }
-
     if (secure == NULL) {
         assert(false);
         return FWK_E_PARAM;
@@ -94,15 +87,8 @@ static int smt_get_secure(fwk_id_t channel_id, bool *secure)
 
 static int smt_get_max_payload_size(fwk_id_t channel_id, size_t *size)
 {
-    int status;
     struct smt_channel_ctx *channel_ctx;
 
-    status = fwk_module_check_call(channel_id);
-    if (status != FWK_SUCCESS) {
-        assert(false);
-        return status;
-    }
-
     if (size == NULL) {
         assert(false);
         return FWK_E_PARAM;
@@ -118,15 +104,8 @@ static int smt_get_max_payload_size(fwk_id_t channel_id, size_t *size)
 
 static int smt_get_message_header(fwk_id_t channel_id, uint32_t *header)
 {
-    int status;
     struct smt_channel_ctx *channel_ctx;
 
-    status = fwk_module_check_call(channel_id);
-    if (status != FWK_SUCCESS) {
-        assert(false);
-        return status;
-    }
-
     if (header == NULL) {
         assert(false);
         return FWK_E_PARAM;
@@ -147,15 +126,8 @@ static int smt_get_payload(fwk_id_t channel_id,
                            const void **payload,
                            size_t *size)
 {
-    int status;
     struct smt_channel_ctx *channel_ctx;
 
-    status = fwk_module_check_call(channel_id);
-    if (status != FWK_SUCCESS) {
-        assert(false);
-        return status;
-    }
-
     if (payload == NULL) {
         assert(false);
         return FWK_E_PARAM;
@@ -182,15 +154,8 @@ static int smt_write_payload(fwk_id_t channel_id,
                              const void *payload,
                              size_t size)
 {
-    int status;
     struct smt_channel_ctx *channel_ctx;
 
-    status = fwk_module_check_call(channel_id);
-    if (status != FWK_SUCCESS) {
-        assert(false);
-        return status;
-    }
-
     channel_ctx =
         &smt_ctx.channel_ctx_table[fwk_id_get_element_idx(channel_id)];
 
@@ -215,14 +180,6 @@ static int smt_respond(fwk_id_t channel_id, const void *payload, size_t size)
 {
     struct smt_channel_ctx *channel_ctx;
     struct mod_smt_memory *memory;
-    int status;
-    (void)status;
-
-    status = fwk_module_check_call(channel_id);
-    if (status != FWK_SUCCESS) {
-        assert(false);
-        return status;
-    }
 
     channel_ctx =
         &smt_ctx.channel_ctx_table[fwk_id_get_element_idx(channel_id)];
@@ -336,13 +293,8 @@ static int smt_slave_handler(struct smt_channel_ctx *channel_ctx)
 
 static int smt_signal_message(fwk_id_t channel_id)
 {
-    int status;
     struct smt_channel_ctx *channel_ctx;
 
-    status = fwk_module_check_call(channel_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     channel_ctx =
         &smt_ctx.channel_ctx_table[fwk_id_get_element_idx(channel_id)];
 
diff --git a/module/system_pll/src/mod_system_pll.c b/module/system_pll/src/mod_system_pll.c
index d2f73a23..ca3de22b 100644
--- a/module/system_pll/src/mod_system_pll.c
+++ b/module/system_pll/src/mod_system_pll.c
@@ -214,14 +214,9 @@ static int system_pll_power_state_change(
     fwk_id_t dev_id,
     unsigned int state)
 {
-    int status;
     uint64_t rate;
     struct system_pll_dev_ctx *ctx;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id);
 
     if (state != MOD_PD_STATE_ON)
@@ -246,13 +241,8 @@ static int system_pll_power_state_pending_change(
     unsigned int current_state,
     unsigned int next_state)
 {
-    int status;
     struct system_pll_dev_ctx *ctx;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id);
 
     if (next_state == MOD_PD_STATE_OFF) {
diff --git a/module/system_power/src/mod_system_power.c b/module/system_power/src/mod_system_power.c
index fbe980d6..7628637b 100644
--- a/module/system_power/src/mod_system_power.c
+++ b/module/system_power/src/mod_system_power.c
@@ -124,10 +124,6 @@ static int system_power_set_state(fwk_id_t pd_id, unsigned int state)
     int status;
     unsigned int soc_wakeup_irq;
 
-    status = fwk_module_check_call(pd_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     if (!fwk_expect(state < MOD_SYSTEM_POWER_POWER_STATE_COUNT))
         return FWK_E_PARAM;
 
@@ -209,12 +205,6 @@ static int system_power_set_state(fwk_id_t pd_id, unsigned int state)
 
 static int system_power_get_state(fwk_id_t pd_id, unsigned int *state)
 {
-    int status;
-
-    status = fwk_module_check_call(pd_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     *state = system_power_ctx.state;
 
     return FWK_SUCCESS;
@@ -262,13 +252,8 @@ static const struct mod_pd_driver_api system_power_power_domain_driver_api = {
 static int system_power_report_power_state_transition(fwk_id_t dev_id,
     unsigned int state)
 {
-    int status;
     static unsigned int sys_ppu_transition_count = 0;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     sys_ppu_transition_count++;
 
     if (sys_ppu_transition_count < system_power_ctx.dev_count)
diff --git a/module/timer/src/mod_timer.c b/module/timer/src/mod_timer.c
index 8edd91f6..a35d8896 100644
--- a/module/timer/src/mod_timer.c
+++ b/module/timer/src/mod_timer.c
@@ -192,11 +192,6 @@ static void _insert_alarm_ctx_into_active_queue(struct dev_ctx *ctx,
 static int get_frequency(fwk_id_t dev_id, uint32_t *frequency)
 {
     struct dev_ctx *ctx;
-    int status;
-
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
 
     ctx = &ctx_table[fwk_id_get_element_idx(dev_id)];
 
@@ -210,13 +205,8 @@ static int time_to_timestamp(fwk_id_t dev_id,
                              uint32_t microseconds,
                              uint64_t *timestamp)
 {
-    int status;
     struct dev_ctx *ctx;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     if (timestamp == NULL)
         return FWK_E_PARAM;
 
@@ -228,11 +218,6 @@ static int time_to_timestamp(fwk_id_t dev_id,
 static int get_counter(fwk_id_t dev_id, uint64_t *counter)
 {
     struct dev_ctx *ctx;
-    int status;
-
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
 
     ctx = &ctx_table[fwk_id_get_element_idx(dev_id)];
 
@@ -249,10 +234,6 @@ static int delay(fwk_id_t dev_id, uint32_t microseconds)
     struct dev_ctx *ctx;
     uint64_t counter, counter_limit;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     ctx = &ctx_table[fwk_id_get_element_idx(dev_id)];
 
     status = _timestamp_from_now(ctx, microseconds, &counter_limit);
@@ -277,10 +258,6 @@ static int wait(fwk_id_t dev_id,
     int status;
     uint64_t counter, counter_limit;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     ctx = &ctx_table[fwk_id_get_element_idx(dev_id)];
 
     status = _timestamp_from_now(ctx, microseconds, &counter_limit);
@@ -313,11 +290,6 @@ static int remaining(fwk_id_t dev_id,
                      uint64_t *remaining_ticks)
 {
     struct dev_ctx *ctx;
-    int status;
-
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
 
     ctx = &ctx_table[fwk_id_get_element_idx(dev_id)];
 
@@ -331,15 +303,11 @@ static int get_next_alarm_remaining(fwk_id_t dev_id,
                                     bool *has_alarm,
                                     uint64_t *remaining_ticks)
 {
-    int status;
+    int status = FWK_E_PARAM;
     const struct dev_ctx *ctx;
     const struct alarm_ctx *alarm_ctx;
     const struct fwk_dlist_node *alarm_ctx_node;
 
-    status = fwk_module_check_call(dev_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     if (has_alarm == NULL)
         return FWK_E_PARAM;
 
@@ -384,16 +352,11 @@ static const struct mod_timer_api timer_api = {
 
 static int alarm_stop(fwk_id_t alarm_id)
 {
-    int status;
     struct dev_ctx *ctx;
     struct alarm_ctx *alarm;
 
     assert(fwk_module_is_valid_sub_element_id(alarm_id));
 
-    status = fwk_module_check_call(alarm_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     ctx = &ctx_table[fwk_id_get_element_idx(alarm_id)];
     alarm = &ctx->alarm_pool[fwk_id_get_sub_element_idx(alarm_id)];
 
@@ -436,10 +399,6 @@ static int alarm_start(fwk_id_t alarm_id,
 
     assert(fwk_module_is_valid_sub_element_id(alarm_id));
 
-    status = fwk_module_check_call(alarm_id);
-    if (status != FWK_SUCCESS)
-        return status;
-
     ctx = ctx_table + fwk_id_get_element_idx(alarm_id);
     alarm = &ctx->alarm_pool[fwk_id_get_sub_element_idx(alarm_id)];