From c96f297f8d3c83560731b86244147f5221d39475 Mon Sep 17 00:00:00 2001
From: Roberto Vargas <roberto.vargas@arm.com>
Date: Mon, 12 Feb 2018 12:36:17 +0000
Subject: [PATCH] Fix MISRA rule 8.3
Rule 8.3: All declarations of an object or function shall
use the same names and type qualifiers.
Fixed for:
make DEBUG=1 PLAT=juno ARCH=aarch32 AARCH32_SP=sp_min RESET_TO_SP_MIN=1 JUNO_AARCH32_EL3_RUNTIME=1 bl32
Change-Id: Ia34f5155e1cdb67161191f69e8d1248cbaa39e1a
Signed-off-by: Roberto Vargas <roberto.vargas@arm.com>
---
include/lib/utils.h | 4 ++--
lib/utils/mem_region.c | 2 +-
plat/arm/css/drivers/mhu/css_mhu_doorbell.c | 4 ++--
plat/arm/css/drivers/scp/css_pm_scmi.c | 2 +-
plat/arm/css/drivers/scp/css_pm_scpi.c | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/lib/utils.h b/include/lib/utils.h
index f367a1f45..5f13e993f 100644
--- a/include/lib/utils.h
+++ b/include/lib/utils.h
@@ -37,10 +37,10 @@ void clear_mem_regions(mem_region_t *tbl, size_t nregions);
* in a way that they minimize the number of entries used in the
* translation tables.
*/
-void clear_map_dyn_mem_regions(mem_region_t *region,
+void clear_map_dyn_mem_regions(struct mem_region *regions,
size_t nregions,
uintptr_t va,
- size_t chunk_size);
+ size_t chunk);
/*
* checks that a region (addr + nbytes-1) of memory is totally covered by
diff --git a/lib/utils/mem_region.c b/lib/utils/mem_region.c
index e9541ba32..a5c3c6170 100644
--- a/lib/utils/mem_region.c
+++ b/lib/utils/mem_region.c
@@ -50,7 +50,7 @@ void clear_mem_regions(mem_region_t *tbl, size_t nregions)
* be cleared, and chunk is the amount of memory mapped and
* cleared in every iteration.
*/
-void clear_map_dyn_mem_regions(mem_region_t *regions,
+void clear_map_dyn_mem_regions(struct mem_region *regions,
size_t nregions,
uintptr_t va,
size_t chunk)
diff --git a/plat/arm/css/drivers/mhu/css_mhu_doorbell.c b/plat/arm/css/drivers/mhu/css_mhu_doorbell.c
index b9faf679b..54f3e057d 100644
--- a/plat/arm/css/drivers/mhu/css_mhu_doorbell.c
+++ b/plat/arm/css/drivers/mhu/css_mhu_doorbell.c
@@ -9,7 +9,7 @@
#include "css_mhu_doorbell.h"
#include "../scmi/scmi.h"
-void mhu_ring_doorbell(scmi_channel_plat_info_t *plat_info)
+void mhu_ring_doorbell(struct scmi_channel_plat_info *plat_info)
{
MHU_RING_DOORBELL(plat_info->db_reg_addr,
plat_info->db_modify_mask,
@@ -17,7 +17,7 @@ void mhu_ring_doorbell(scmi_channel_plat_info_t *plat_info)
return;
}
-void mhuv2_ring_doorbell(scmi_channel_plat_info_t *plat_info)
+void mhuv2_ring_doorbell(struct scmi_channel_plat_info *plat_info)
{
/* wake receiver */
MHU_V2_ACCESS_REQUEST(MHUV2_BASE_ADDR);
diff --git a/plat/arm/css/drivers/scp/css_pm_scmi.c b/plat/arm/css/drivers/scp/css_pm_scmi.c
index 91ea63a44..0a5cff668 100644
--- a/plat/arm/css/drivers/scp/css_pm_scmi.c
+++ b/plat/arm/css/drivers/scp/css_pm_scmi.c
@@ -142,7 +142,7 @@ void css_scp_suspend(const struct psci_power_state *target_state)
* Helper function to turn off a CPU power domain and its parent power domains
* if applicable.
*/
-void css_scp_off(const psci_power_state_t *target_state)
+void css_scp_off(const struct psci_power_state *target_state)
{
int lvl = 0, ret;
uint32_t scmi_pwr_state = 0;
diff --git a/plat/arm/css/drivers/scp/css_pm_scpi.c b/plat/arm/css/drivers/scp/css_pm_scpi.c
index 18e71f6e3..123d54f4e 100644
--- a/plat/arm/css/drivers/scp/css_pm_scpi.c
+++ b/plat/arm/css/drivers/scp/css_pm_scpi.c
@@ -47,7 +47,7 @@ void css_scp_suspend(const struct psci_power_state *target_state)
* if applicable. Since SCPI doesn't differentiate between OFF and suspend, we
* call the suspend helper here.
*/
-void css_scp_off(const psci_power_state_t *target_state)
+void css_scp_off(const struct psci_power_state *target_state)
{
css_scp_suspend(target_state);
}
--
GitLab