diff --git a/module/resource_perms/src/mod_resource_perms.c b/module/resource_perms/src/mod_resource_perms.c
index a4dcdf4098c6df9ad46d9604c67105e9ccf097e2..33fa5e9566800ea2b8b13dd97f2fa571ea9591fa 100644
--- a/module/resource_perms/src/mod_resource_perms.c
+++ b/module/resource_perms/src/mod_resource_perms.c
@@ -1,6 +1,6 @@
 /*
  * Arm SCP/MCP Software
- * Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved.
+ * Copyright (c) 2020-2023, Arm Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -238,8 +238,8 @@ static int mod_res_message_id_to_index(
         }
         if ((message_id >= MOD_SCMI_PD_POWER_DOMAIN_ATTRIBUTES) &&
             (message_id <= MOD_SCMI_PD_POWER_STATE_NOTIFY)) {
-            *message_idx = (int32_t)(
-                message_id - (uint32_t)MOD_SCMI_PD_POWER_DOMAIN_ATTRIBUTES);
+            *message_idx =
+                (int32_t)(message_id - (uint32_t)MOD_SCMI_PD_POWER_DOMAIN_ATTRIBUTES);
         }
         return FWK_SUCCESS;
 
@@ -260,8 +260,8 @@ static int mod_res_message_id_to_index(
         }
         if ((message_id >= MOD_SCMI_PERF_DOMAIN_ATTRIBUTES) &&
             (message_id <= MOD_SCMI_PERF_DESCRIBE_FAST_CHANNEL)) {
-            *message_idx = (int32_t)(
-                message_id - (uint32_t)MOD_SCMI_PERF_DOMAIN_ATTRIBUTES);
+            *message_idx =
+                (int32_t)(message_id - (uint32_t)MOD_SCMI_PERF_DOMAIN_ATTRIBUTES);
         }
         return FWK_SUCCESS;
 
@@ -282,8 +282,8 @@ static int mod_res_message_id_to_index(
         }
         if ((message_id >= MOD_SCMI_SENSOR_DESCRIPTION_GET) &&
             (message_id <= MOD_SCMI_SENSOR_READING_GET)) {
-            *message_idx = (int32_t)(
-                message_id - (uint32_t)MOD_SCMI_SENSOR_DESCRIPTION_GET);
+            *message_idx =
+                (int32_t)(message_id - (uint32_t)MOD_SCMI_SENSOR_DESCRIPTION_GET);
         }
         return FWK_SUCCESS;
 
@@ -293,8 +293,8 @@ static int mod_res_message_id_to_index(
         }
         if ((message_id >= MOD_SCMI_RESET_DOMAIN_ATTRIBUTES) &&
             (message_id <= MOD_SCMI_RESET_NOTIFY)) {
-            *message_idx = (int32_t)(
-                message_id - (uint32_t)MOD_SCMI_RESET_DOMAIN_ATTRIBUTES);
+            *message_idx =
+                (int32_t)(message_id - (uint32_t)MOD_SCMI_RESET_DOMAIN_ATTRIBUTES);
         }
         return FWK_SUCCESS;
 
@@ -304,8 +304,8 @@ static int mod_res_message_id_to_index(
         }
         if ((message_id >= MOD_SCMI_VOLTD_DOMAIN_ATTRIBUTES) &&
             (message_id <= MOD_SCMI_VOLTD_LEVEL_GET)) {
-            *message_idx = (int32_t)(
-                message_id - (uint32_t)MOD_SCMI_VOLTD_DOMAIN_ATTRIBUTES);
+            *message_idx =
+                (int32_t)(message_id - (uint32_t)MOD_SCMI_VOLTD_DOMAIN_ATTRIBUTES);
         }
         return FWK_SUCCESS;
 
@@ -346,8 +346,8 @@ static int mod_res_resource_id_to_index(
 {
     uint32_t agent_idx;
     int message_count;
-    int message_offset;
-    int resource_size;
+    uint32_t message_offset;
+    uint32_t resource_size;
     int status;
 
     /*
@@ -395,8 +395,8 @@ static int mod_res_resource_id_to_index(
             message_count = (int)MOD_SCMI_PD_POWER_STATE_NOTIFY -
                 (int)MOD_SCMI_PD_POWER_DOMAIN_ATTRIBUTES + 1;
             message_offset =
-                (int)(message_id - (uint32_t)MOD_SCMI_PD_POWER_DOMAIN_ATTRIBUTES);
-            resource_size = (int)resources_perms_ctx.pd_count;
+                (message_id - (uint32_t)MOD_SCMI_PD_POWER_DOMAIN_ATTRIBUTES);
+            resource_size = resources_perms_ctx.pd_count;
             break;
         }
         return FWK_E_PARAM;
@@ -407,8 +407,8 @@ static int mod_res_resource_id_to_index(
             message_count = (int)MOD_SCMI_PERF_DESCRIBE_FAST_CHANNEL -
                 (int)MOD_SCMI_PERF_DOMAIN_ATTRIBUTES + 1;
             message_offset =
-                (int)(message_id - (uint32_t)MOD_SCMI_PERF_DOMAIN_ATTRIBUTES);
-            resource_size = (int)resources_perms_ctx.perf_count;
+                (message_id - (uint32_t)MOD_SCMI_PERF_DOMAIN_ATTRIBUTES);
+            resource_size = resources_perms_ctx.perf_count;
             break;
         }
         return FWK_E_PARAM;
@@ -418,9 +418,8 @@ static int mod_res_resource_id_to_index(
             (message_id <= MOD_SCMI_CLOCK_CONFIG_SET)) {
             message_count = (int)MOD_SCMI_CLOCK_CONFIG_SET -
                 (int)MOD_SCMI_CLOCK_ATTRIBUTES + 1;
-            message_offset =
-                (int)(message_id - (uint32_t)MOD_SCMI_CLOCK_ATTRIBUTES);
-            resource_size = (int)resources_perms_ctx.clock_count;
+            message_offset = (message_id - (uint32_t)MOD_SCMI_CLOCK_ATTRIBUTES);
+            resource_size = resources_perms_ctx.clock_count;
             break;
         }
         return FWK_E_PARAM;
@@ -431,8 +430,8 @@ static int mod_res_resource_id_to_index(
             message_count = (int)MOD_SCMI_SENSOR_READING_GET -
                 (int)MOD_SCMI_SENSOR_DESCRIPTION_GET + 1;
             message_offset =
-                (int)(message_id - (uint32_t)MOD_SCMI_SENSOR_DESCRIPTION_GET);
-            resource_size = (int)resources_perms_ctx.sensor_count;
+                (message_id - (uint32_t)MOD_SCMI_SENSOR_DESCRIPTION_GET);
+            resource_size = resources_perms_ctx.sensor_count;
             break;
         }
         return FWK_E_PARAM;
@@ -444,8 +443,8 @@ static int mod_res_resource_id_to_index(
             message_count = (int)MOD_SCMI_RESET_NOTIFY -
                 (int)MOD_SCMI_RESET_DOMAIN_ATTRIBUTES + 1;
             message_offset =
-                (int)(message_id - (uint32_t)MOD_SCMI_RESET_DOMAIN_ATTRIBUTES);
-            resource_size = (int)resources_perms_ctx.reset_domain_count;
+                (message_id - (uint32_t)MOD_SCMI_RESET_DOMAIN_ATTRIBUTES);
+            resource_size = (uint32_t)resources_perms_ctx.reset_domain_count;
             break;
         }
         return FWK_E_PARAM;
@@ -457,8 +456,8 @@ static int mod_res_resource_id_to_index(
             message_count = (int)MOD_SCMI_VOLTD_LEVEL_GET -
                 (int)MOD_SCMI_VOLTD_DOMAIN_ATTRIBUTES + 1;
             message_offset =
-                (int)(message_id - (uint32_t)MOD_SCMI_VOLTD_DOMAIN_ATTRIBUTES);
-            resource_size = (int)resources_perms_ctx.voltd_count;
+                (message_id - (uint32_t)MOD_SCMI_VOLTD_DOMAIN_ATTRIBUTES);
+            resource_size = (uint32_t)resources_perms_ctx.voltd_count;
             break;
         }
         return FWK_E_PARAM;
@@ -473,8 +472,7 @@ static int mod_res_resource_id_to_index(
         return FWK_E_PARAM;
     }
 
-    resource_size =
-        (int)MOD_RES_PERMS_RESOURCE_ELEMENT((unsigned int)resource_size) + 1;
+    resource_size = (uint32_t)MOD_RES_PERMS_RESOURCE_ELEMENT(resource_size) + 1;
 
     /*
      * message_count: the number of messages for the agent.