commit 950bd7bd9e95aaa3d1e957d6ce51283d8cf81094
author AlexeiFedorov <Alexei.Fedorov@arm.com> Thu Aug 24 15:25:22 2023 +0100
committer Soby Mathew <soby.mathew@arm.com> Tue Sep 05 11:52:31 2023 +0200
tree 3642761c8fa5a3c9c5b4a760fdc4d50d15f69eaa
parent db513d5fa6b3699dc5881a8db67bdfbdb6451e7d

fix(rmm): fix MISRA C:2012 Rule 8.3 violations

Fixes Function Declaration to use the same name and type
as the definition.

Signed-off-by: AlexeiFedorov <Alexei.Fedorov@arm.com>
Change-Id: I4f83457ef62779cc93967f0526fa4aaeb68b14fb

lib/realm/include/buffer.h

diff --git a/lib/realm/include/buffer.h b/lib/realm/include/buffer.h
index 7cb0a39..dc716de 100644
--- a/lib/realm/include/buffer.h
+++ b/lib/realm/include/buffer.h
@@ -43,12 +43,12 @@
 void buffer_unmap(void *buf);
 
 bool ns_buffer_read(enum buffer_slot slot,
-		    struct granule *granule,
+		    struct granule *ns_gr,
 		    unsigned int offset,
 		    unsigned int size,
 		    void *dest);
 bool ns_buffer_write(enum buffer_slot slot,
-		     struct granule *granule,
+		     struct granule *ns_gr,
 		     unsigned int offset,
 		     unsigned int size,
 		     void *src);

lib/realm/include/realm.h

diff --git a/lib/realm/include/realm.h b/lib/realm/include/realm.h
index 0b14157..c86b03d 100644
--- a/lib/realm/include/realm.h
+++ b/lib/realm/include/realm.h
@@ -257,7 +257,7 @@
 
 enum s2_walk_status realm_ipa_to_pa(struct rec *rec,
 				    unsigned long ipa,
-				    struct s2_walk_result *res);
+				    struct s2_walk_result *s2_walk);
 
 enum s2_walk_status realm_ipa_get_ripas(struct rec *rec, unsigned long ipa,
 					enum ripas *ripas_ptr);

lib/realm/include/rec.h

diff --git a/lib/realm/include/rec.h b/lib/realm/include/rec.h
index 6b5b6a2..ecf63ce 100644
--- a/lib/realm/include/rec.h
+++ b/lib/realm/include/rec.h
@@ -266,7 +266,7 @@
 
 void rec_run_loop(struct rec *rec, struct rmi_rec_exit *rec_exit);
 void inject_serror(struct rec *rec, unsigned long vsesr);
-void emulate_stage2_data_abort(struct rec *rec, struct rmi_rec_exit *exit,
+void emulate_stage2_data_abort(struct rec *rec, struct rmi_rec_exit *rec_exit,
 			       unsigned long rtt_level);
 
 #endif /* __ASSEMBLER__ */

lib/realm/include/table.h

diff --git a/lib/realm/include/table.h b/lib/realm/include/table.h
index 73cceec..872cc44 100644
--- a/lib/realm/include/table.h
+++ b/lib/realm/include/table.h
@@ -39,8 +39,8 @@
 unsigned long s2tte_create_unassigned_destroyed(void);
 unsigned long s2tte_create_assigned_empty(unsigned long pa, long level);
 unsigned long s2tte_create_assigned_ram(unsigned long pa, long level);
-unsigned long s2tte_create_assigned_ns(unsigned long s2tte, long level);
-unsigned long s2tte_create_assigned_destroyed(unsigned long s2tte, long level);
+unsigned long s2tte_create_assigned_ns(unsigned long pa, long level);
+unsigned long s2tte_create_assigned_destroyed(unsigned long pa, long level);
 unsigned long s2tte_create_table(unsigned long pa, long level);
 
 bool host_ns_s2tte_is_valid(unsigned long s2tte, long level);
@@ -78,9 +78,10 @@
 unsigned long s2tte_map_size(int level);
 
 struct realm_s2_context;
-void invalidate_page(const struct realm_s2_context *ctx, unsigned long addr);
-void invalidate_block(const struct realm_s2_context *ctx, unsigned long addr);
-void invalidate_pages_in_block(const struct realm_s2_context *ctx, unsigned long addr);
+void invalidate_page(const struct realm_s2_context *s2_ctx, unsigned long addr);
+void invalidate_block(const struct realm_s2_context *s2_ctx, unsigned long addr);
+void invalidate_pages_in_block(const struct realm_s2_context *s2_ctx,
+				unsigned long addr);
 
 bool table_is_unassigned_empty_block(unsigned long *table);
 bool table_is_unassigned_ram_block(unsigned long *table);