diff --git a/drivers/renesas/rcar/common.c b/drivers/renesas/rcar/common.c
index 42bdce579..9b7c1eb16 100644
--- a/drivers/renesas/rcar/common.c
+++ b/drivers/renesas/rcar/common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Renesas Electronics Corporation. All rights reserved.
+ * Copyright (c) 2018-2020, Renesas Electronics Corporation. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -8,24 +8,27 @@
 
 #include "rcar_private.h"
 
-void
 #if IMAGE_BL31
-    __attribute__ ((section(".system_ram")))
+void __attribute__ ((section(".system_ram"))) cpg_write(uintptr_t regadr, uint32_t regval)
+#else
+void cpg_write(uintptr_t regadr, uint32_t regval)
 #endif
-    cpg_write(uintptr_t regadr, uint32_t regval)
 {
-	uint32_t value = (regval);
+	uint32_t value = regval;
+
 	mmio_write_32((uintptr_t) RCAR_CPGWPR, ~value);
 	mmio_write_32(regadr, value);
 }
 
-void
 #if IMAGE_BL31
-    __attribute__ ((section(".system_ram")))
+void __attribute__ ((section(".system_ram"))) mstpcr_write(uint32_t mstpcr, uint32_t mstpsr,
+							   uint32_t target_bit)
+#else
+void mstpcr_write(uint32_t mstpcr, uint32_t mstpsr, uint32_t target_bit)
 #endif
-    mstpcr_write(uint32_t mstpcr, uint32_t mstpsr, uint32_t target_bit)
 {
 	uint32_t reg;
+
 	reg = mmio_read_32(mstpcr);
 	reg &= ~target_bit;
 	cpg_write(mstpcr, reg);