Standardise header guards across codebase

All identifiers, regardless of use, that start with two underscores are
reserved. This means they can't be used in header guards.

The style that this project is now to use the full name of the file in
capital letters followed by 'H'. For example, for a file called
"uart_example.h", the header guard is UART_EXAMPLE_H.

The exceptions are files that are imported from other projects:

- CryptoCell driver
- dt-bindings folders
- zlib headers

Change-Id: I50561bf6c88b491ec440d0c8385c74650f3c106e
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>

28 files changed, 85 insertions, 85 deletions

diff --git a/plat/imx/common/include/imx8_iomux.h b/plat/imx/common/include/imx8_iomux.h
index 7a7f5491c..0e93d9800 100644
--- a/plat/imx/common/include/imx8_iomux.h
+++ b/plat/imx/common/include/imx8_iomux.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IMX8_IOMUX_H__
-#define __IMX8_IOMUX_H__
+#ifndef IMX8_IOMUX_H
+#define IMX8_IOMUX_H
 
 #define PADRING_IFMUX_EN_SHIFT		31
 #define PADRING_IFMUX_EN_MASK		(1 << PADRING_IFMUX_EN_SHIFT)
@@ -22,4 +22,4 @@
 #define PADRING_DSE_SHIFT		0
 #define PADRING_DSE_MASK		(0x7 << PADRING_DSE_SHIFT)
 
-#endif	/* __IMX8_IOMUX_H__ */
+#endif /* IMX8_IOMUX_H */
diff --git a/plat/imx/common/include/imx8_lpuart.h b/plat/imx/common/include/imx8_lpuart.h
index 33f955df7..8e1184f95 100644
--- a/plat/imx/common/include/imx8_lpuart.h
+++ b/plat/imx/common/include/imx8_lpuart.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IMX_LPUART_H__
-#define __IMX_LPUART_H__
+#ifndef IMX8_LPUART_H
+#define IMX8_LPUART_H
 
 #include <console.h>
 
@@ -63,4 +63,4 @@ int console_lpuart_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud,
 			   console_lpuart_t *console);
 #endif /*__ASSEMBLY__*/
 
-#endif  /* __IMX_LPUART_H__*/
+#endif /* IMX8_LPUART_H */
diff --git a/plat/imx/common/include/imx8qm_pads.h b/plat/imx/common/include/imx8qm_pads.h
index 6107bd926..a5c1d2ceb 100644
--- a/plat/imx/common/include/imx8qm_pads.h
+++ b/plat/imx/common/include/imx8qm_pads.h
@@ -8,8 +8,8 @@
  * Header file used to configure SoC pad list.
  */
 
-#ifndef SC_PADS_H
-#define SC_PADS_H
+#ifndef IMX8QM_PADS_H
+#define IMX8QM_PADS_H
 
 /* Includes */
 
@@ -290,4 +290,4 @@
 #define SC_P_COMP_CTL_GPIO_1V8_3V3_ENET_ENETA    268	/*  */
 /*@}*/
 
-#endif				/* SC_PADS_H */
+#endif /* IMX8QM_PADS_H */
diff --git a/plat/imx/common/include/imx8qx_pads.h b/plat/imx/common/include/imx8qx_pads.h
index 0e153bb1e..5445aa152 100644
--- a/plat/imx/common/include/imx8qx_pads.h
+++ b/plat/imx/common/include/imx8qx_pads.h
@@ -8,8 +8,8 @@
  * Header file used to configure SoC pad list.
  */
 
-#ifndef SC_PADS_H
-#define SC_PADS_H
+#ifndef IMX8QX_PADS_H
+#define IMX8QX_PADS_H
 
 /* Includes */
 
@@ -195,4 +195,4 @@
 #define SC_P_COMP_CTL_GPIO_1V8_3V3_QSPI0B        173	/*  */
 /*@}*/
 
-#endif				/* SC_PADS_H */
+#endif /* IMX8QX_PADS_H */
diff --git a/plat/imx/common/include/imx_aips.h b/plat/imx/common/include/imx_aips.h
index 3c33553ba..1d41fe038 100644
--- a/plat/imx/common/include/imx_aips.h
+++ b/plat/imx/common/include/imx_aips.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IMX_AIPS_H__
-#define __IMX_AIPS_H__
+#ifndef IMX_AIPS_H
+#define IMX_AIPS_H
 
 #include <stdint.h>
 
@@ -19,4 +19,4 @@ struct aipstz_regs {
 
 void imx_aips_init(void);
 
-#endif /* __IMX_AIPS_H__ */
+#endif /* IMX_AIPS_H */
diff --git a/plat/imx/common/include/imx_caam.h b/plat/imx/common/include/imx_caam.h
index 2e1f41a31..335bd0f8b 100644
--- a/plat/imx/common/include/imx_caam.h
+++ b/plat/imx/common/include/imx_caam.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IMX_CAAM_H__
-#define __IMX_CAAM_H__
+#ifndef IMX_CAAM_H
+#define IMX_CAAM_H
 
 #include <stdint.h>
 #include <arch.h>
@@ -66,4 +66,4 @@ struct caam_ctrl {
 /* Declare CAAM API */
 void imx_caam_init(void);
 
-#endif /* __IMX_CAAM_H__ */
+#endif /* IMX_CAAM_H */
diff --git a/plat/imx/common/include/imx_clock.h b/plat/imx/common/include/imx_clock.h
index 85586380f..ce245ad55 100644
--- a/plat/imx/common/include/imx_clock.h
+++ b/plat/imx/common/include/imx_clock.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __IMX_CLOCK_H__
-#define __IMX_CLOCK_H__
+#ifndef IMX_CLOCK_H
+#define IMX_CLOCK_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -999,4 +999,4 @@ void imx_clock_enable_usb(unsigned int usb_id);
 void imx_clock_disable_usb(unsigned int usb_id);
 void imx_clock_set_usb_clk_root_bits(uint32_t usb_clk_root_en_bits);
 
-#endif /* __IMX_CLOCK_H__ */
+#endif /* IMX_CLOCK_H */
diff --git a/plat/imx/common/include/imx_csu.h b/plat/imx/common/include/imx_csu.h
index 9bf937386..879d10b67 100644
--- a/plat/imx/common/include/imx_csu.h
+++ b/plat/imx/common/include/imx_csu.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __IMX_CSU_H__
-#define __IMX_CSU_H__
+#ifndef IMX_CSU_H
+#define IMX_CSU_H
 
 #include <arch.h>
 
@@ -41,4 +41,4 @@
 			      CSU_CSL_SUR_S2)
 void imx_csu_init(void);
 
-#endif /* __IMX_CSU_H__ */
+#endif /* IMX_CSU_H */
diff --git a/plat/imx/common/include/imx_hab.h b/plat/imx/common/include/imx_hab.h
index e3d266c66..22c074278 100644
--- a/plat/imx/common/include/imx_hab.h
+++ b/plat/imx/common/include/imx_hab.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __IMX_HAB_H__
-#define __IMX_HAB_H__
+#ifndef IMX_HAB_H
+#define IMX_HAB_H
 
 #include <imx_hab_arch.h>
 #include <imx_regs.h>
@@ -30,4 +30,4 @@
 #define HAB_ROM_VECTOR_TABLE_REPORT_STATUS	(HAB_ROM_VECTOR_BASE + 0x24)
 #define HAB_ROM_VECTOR_TABLE_FAILSAFE		(HAB_ROM_VECTOR_BASE + 0x28)
 
-#endif /* __IMX_HAB_H__ */
+#endif /* IMX_HAB_H */
diff --git a/plat/imx/common/include/imx_io_mux.h b/plat/imx/common/include/imx_io_mux.h
index 44284f6fe..9b304217e 100644
--- a/plat/imx/common/include/imx_io_mux.h
+++ b/plat/imx/common/include/imx_io_mux.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IMX_IO_MUX_H__
-#define __IMX_IO_MUX_H__
+#ifndef IMX_IO_MUX_H
+#define IMX_IO_MUX_H
 
 #include <stdint.h>
 
@@ -606,4 +606,4 @@
 void imx_io_muxc_set_pad_alt_function(uint32_t pad_mux_offset, uint32_t alt_function);
 void imx_io_muxc_set_pad_features(uint32_t pad_feature_offset, uint32_t pad_features);
 
-#endif /* __IMX_IO_MUX_H__ */
+#endif /* IMX_IO_MUX_H */
diff --git a/plat/imx/common/include/imx_snvs.h b/plat/imx/common/include/imx_snvs.h
index 081ae8c68..0aed1e142 100644
--- a/plat/imx/common/include/imx_snvs.h
+++ b/plat/imx/common/include/imx_snvs.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __IMX_SNVS_H__
-#define __IMX_SNVS_H__
+#ifndef IMX_SNVS_H
+#define IMX_SNVS_H
 
 #include <stdint.h>
 #include <arch.h>
@@ -79,4 +79,4 @@ struct snvs {
 
 void imx_snvs_init(void);
 
-#endif /* __IMX_SNVS_H__ */
+#endif /* IMX_SNVS_H */
diff --git a/plat/imx/common/include/imx_wdog.h b/plat/imx/common/include/imx_wdog.h
index 8033e6268..7b3037dfe 100644
--- a/plat/imx/common/include/imx_wdog.h
+++ b/plat/imx/common/include/imx_wdog.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IMX_WDOG_H__
-#define __IMX_WDOG_H__
+#ifndef IMX_WDOG_H
+#define IMX_WDOG_H
 
 #include <arch.h>
 #include <stdint.h>
@@ -58,4 +58,4 @@ static inline int wicr_calc_wict(int sec, int half_sec)
 /* External facing API */
 void imx_wdog_init(void);
 
-#endif /* __IMX_WDOG_H__ */
+#endif /* IMX_WDOG_H */
diff --git a/plat/imx/common/include/plat_imx8.h b/plat/imx/common/include/plat_imx8.h
index a333bfbe1..03799c459 100644
--- a/plat/imx/common/include/plat_imx8.h
+++ b/plat/imx/common/include/plat_imx8.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_IMX8_H__
-#define __PLAT_IMX8_H__
+#ifndef PLAT_IMX8_H
+#define PLAT_IMX8_H
 
 #include <gicv3.h>
 #include <psci.h>
@@ -23,4 +23,5 @@ void __dead2 imx_system_reset(void);
 int imx_validate_power_state(unsigned int power_state,
 			psci_power_state_t *req_state);
 void imx_get_sys_suspend_power_state(psci_power_state_t *req_state);
-#endif /*__PLAT_IMX8_H__ */
+
+#endif /* PLAT_IMX8_H */
diff --git a/plat/imx/common/include/sci/sci.h b/plat/imx/common/include/sci/sci.h
index 3dd17ce1f..f0a25027c 100644
--- a/plat/imx/common/include/sci/sci.h
+++ b/plat/imx/common/include/sci/sci.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _SC_SCI_H
-#define _SC_SCI_H
+#ifndef SCI_H
+#define SCI_H
 
 /* Defines */
 
@@ -16,4 +16,4 @@
 #include <sci/svc/pm/sci_pm_api.h>
 #include <sci/svc/rm/sci_rm_api.h>
 
-#endif /* _SC_SCI_H */
+#endif /* SCI_H */
diff --git a/plat/imx/common/include/sci/sci_ipc.h b/plat/imx/common/include/sci/sci_ipc.h
index c169a7911..1167ea367 100644
--- a/plat/imx/common/include/sci/sci_ipc.h
+++ b/plat/imx/common/include/sci/sci_ipc.h
@@ -8,8 +8,8 @@
  * Header file for the IPC implementation.
  */
 
-#ifndef SC_IPC_H
-#define SC_IPC_H
+#ifndef SCI_IPC_H
+#define SCI_IPC_H
 
 /* Includes */
 
@@ -64,4 +64,4 @@ void sc_ipc_write(sc_ipc_t ipc, void *data);
 
 sc_ipc_t ipc_handle;
 
-#endif				/* SC_IPC_H */
+#endif /* SCI_IPC_H */
diff --git a/plat/imx/common/include/sci/sci_rpc.h b/plat/imx/common/include/sci/sci_rpc.h
index 052f3615c..1771baed3 100644
--- a/plat/imx/common/include/sci/sci_rpc.h
+++ b/plat/imx/common/include/sci/sci_rpc.h
@@ -8,8 +8,8 @@
  * Header file for the RPC implementation.
  */
 
-#ifndef SC_RPC_H
-#define SC_RPC_H
+#ifndef SCI_RPC_H
+#define SCI_RPC_H
 
 /* Includes */
 
@@ -124,4 +124,4 @@ void sc_rpc_dispatch(sc_rsrc_t mu, sc_rpc_msg_t *msg);
  */
 void sc_rpc_xlate(sc_ipc_t ipc, sc_rpc_msg_t *msg);
 
-#endif				/* SC_RPC_H */
+#endif /* SCI_RPC_H */
diff --git a/plat/imx/common/include/sci/sci_scfw.h b/plat/imx/common/include/sci/sci_scfw.h
index 781c69e01..a169f88c5 100644
--- a/plat/imx/common/include/sci/sci_scfw.h
+++ b/plat/imx/common/include/sci/sci_scfw.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _SC_SCFW_H
-#define _SC_SCFW_H
+#ifndef SCI_SCFW_H
+#define SCI_SCFW_H
 
 /* Includes */
 
@@ -33,5 +33,4 @@ typedef uint64_t sc_ipc_t;
 typedef uint64_t sc_ipc_id_t;
 
 
-#endif /* _SC_SCFW_H */
-
+#endif /* SCI_SCFW_H */
diff --git a/plat/imx/common/include/sci/sci_types.h b/plat/imx/common/include/sci/sci_types.h
index 3ee527676..6ade01cd1 100644
--- a/plat/imx/common/include/sci/sci_types.h
+++ b/plat/imx/common/include/sci/sci_types.h
@@ -8,8 +8,8 @@
  * Header file containing types used across multiple service APIs.
  */
 
-#ifndef SC_TYPES_H
-#define SC_TYPES_H
+#ifndef SCI_TYPES_H
+#define SCI_TYPES_H
 
 /* Includes */
 
@@ -846,4 +846,4 @@ typedef __UINT32_TYPE__ uint32_t;
 typedef __UINT64_TYPE__ uint64_t;
 #endif
 
-#endif				/* SC_TYPES_H */
+#endif /* SCI_TYPES_H */
diff --git a/plat/imx/common/include/sci/svc/pad/sci_pad_api.h b/plat/imx/common/include/sci/svc/pad/sci_pad_api.h
index 0955678ba..dc23eedb3 100644
--- a/plat/imx/common/include/sci/svc/pad/sci_pad_api.h
+++ b/plat/imx/common/include/sci/svc/pad/sci_pad_api.h
@@ -52,8 +52,8 @@
  * @{
  */
 
-#ifndef SC_PAD_API_H
-#define SC_PAD_API_H
+#ifndef SCI_PAD_API_H
+#define SCI_PAD_API_H
 
 /* Includes */
 
@@ -567,6 +567,6 @@ sc_err_t sc_pad_get_gp_28fdsoi_comp(sc_ipc_t ipc, sc_pad_t pad,
 
 /* @} */
 
-#endif				/* SC_PAD_API_H */
+#endif /* SCI_PAD_API_H */
 
 /**@}*/
diff --git a/plat/imx/common/include/sci/svc/pm/sci_pm_api.h b/plat/imx/common/include/sci/svc/pm/sci_pm_api.h
index 5c3c3821d..76ca5c4ea 100644
--- a/plat/imx/common/include/sci/svc/pm/sci_pm_api.h
+++ b/plat/imx/common/include/sci/svc/pm/sci_pm_api.h
@@ -16,8 +16,8 @@
  * @{
  */
 
-#ifndef SC_PM_API_H
-#define SC_PM_API_H
+#ifndef SCI_PM_API_H
+#define SCI_PM_API_H
 
 /* Includes */
 
@@ -679,6 +679,6 @@ sc_err_t sc_pm_cpu_start(sc_ipc_t ipc, sc_rsrc_t resource, sc_bool_t enable,
 
 /* @} */
 
-#endif				/* SC_PM_API_H */
+#endif /* SCI_PM_API_H */
 
 /**@}*/
diff --git a/plat/imx/common/include/sci/svc/rm/sci_rm_api.h b/plat/imx/common/include/sci/svc/rm/sci_rm_api.h
index 012d919fd..df1bc401c 100644
--- a/plat/imx/common/include/sci/svc/rm/sci_rm_api.h
+++ b/plat/imx/common/include/sci/svc/rm/sci_rm_api.h
@@ -18,8 +18,8 @@
  * @{
  */
 
-#ifndef SC_RM_API_H
-#define SC_RM_API_H
+#ifndef SCI_RM_API_H
+#define SCI_RM_API_H
 
 /* Includes */
 
@@ -752,6 +752,6 @@ void sc_rm_dump(sc_ipc_t ipc);
 
 /* @} */
 
-#endif				/* SC_RM_API_H */
+#endif /* SCI_RM_API_H */
 
 /**@}*/
diff --git a/plat/imx/common/sci/svc/pad/sci_pad_rpc.h b/plat/imx/common/sci/svc/pad/sci_pad_rpc.h
index 686e6e997..8e9c4bb33 100644
--- a/plat/imx/common/sci/svc/pad/sci_pad_rpc.h
+++ b/plat/imx/common/sci/svc/pad/sci_pad_rpc.h
@@ -11,8 +11,8 @@
  * @{
  */
 
-#ifndef SC_PAD_RPC_H
-#define SC_PAD_RPC_H
+#ifndef SCI_PAD_RPC_H
+#define SCI_PAD_RPC_H
 
 /* Includes */
 
@@ -61,6 +61,6 @@ void pad_dispatch(sc_rm_pt_t caller_pt, sc_rpc_msg_t *msg);
  */
 void pad_xlate(sc_ipc_t ipc, sc_rpc_msg_t *msg);
 
-#endif				/* SC_PAD_RPC_H */
+#endif /* SCI_PAD_RPC_H */
 
 /**@}*/
diff --git a/plat/imx/common/sci/svc/pm/sci_pm_rpc.h b/plat/imx/common/sci/svc/pm/sci_pm_rpc.h
index 19ab6e441..8bad3c7b5 100644
--- a/plat/imx/common/sci/svc/pm/sci_pm_rpc.h
+++ b/plat/imx/common/sci/svc/pm/sci_pm_rpc.h
@@ -11,8 +11,8 @@
  * @{
  */
 
-#ifndef SC_PM_RPC_H
-#define SC_PM_RPC_H
+#ifndef SCI_PM_RPC_H
+#define SCI_PM_RPC_H
 
 /* Includes */
 
@@ -66,6 +66,6 @@ void pm_dispatch(sc_rm_pt_t caller_pt, sc_rpc_msg_t *msg);
  */
 void pm_xlate(sc_ipc_t ipc, sc_rpc_msg_t *msg);
 
-#endif				/* SC_PM_RPC_H */
+#endif /* SCI_PM_RPC_H */
 
 /**@}*/
diff --git a/plat/imx/common/sci/svc/rm/sci_rm_rpc.h b/plat/imx/common/sci/svc/rm/sci_rm_rpc.h
index e3de4505e..45d05f995 100644
--- a/plat/imx/common/sci/svc/rm/sci_rm_rpc.h
+++ b/plat/imx/common/sci/svc/rm/sci_rm_rpc.h
@@ -11,8 +11,8 @@
  * @{
  */
 
-#ifndef SC_RM_RPC_H
-#define SC_RM_RPC_H
+#ifndef SCI_RM_RPC_H
+#define SCI_RM_RPC_H
 
 /* Includes */
 
@@ -76,6 +76,6 @@ void rm_dispatch(sc_rm_pt_t caller_pt, sc_rpc_msg_t *msg);
  */
 void rm_xlate(sc_ipc_t ipc, sc_rpc_msg_t *msg);
 
-#endif				/* SC_RM_RPC_H */
+#endif /* SCI_RM_RPC_H */
 
 /**@}*/
diff --git a/plat/imx/imx7/include/imx_hab_arch.h b/plat/imx/imx7/include/imx_hab_arch.h
index 338a02745..2a34c6a89 100644
--- a/plat/imx/imx7/include/imx_hab_arch.h
+++ b/plat/imx/imx7/include/imx_hab_arch.h
@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __IMX_HAB_ARCH_H__
-#define __IMX_HAB_ARCH_H__
+#ifndef IMX_HAB_ARCH_H
+#define IMX_HAB_ARCH_H
 
 /* Define the offset the High Assurance Boot callback table is at */
 #define HAB_CALLBACK_OFFSET	0x100
 
-#endif /* __IMX_HAB_ARCH_H__ */
+#endif /* IMX_HAB_ARCH_H */
diff --git a/plat/imx/imx7/include/imx_regs.h b/plat/imx/imx7/include/imx_regs.h
index aa345cfca..3c7e20f50 100644
--- a/plat/imx/imx7/include/imx_regs.h
+++ b/plat/imx/imx7/include/imx_regs.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IMX_REGS_H__
-#define __IMX_REGS_H__
+#ifndef IMX_REGS_H
+#define IMX_REGS_H
 
 /* Define the processor memory map */
 
@@ -105,4 +105,4 @@
 /* Define the maximum number of WDOG blocks on this SoC */
 #define MXC_MAX_WDOG_NUM		0x04
 
-#endif /* __IMX_REGS_H__ */
+#endif /* IMX_REGS_H */
diff --git a/plat/imx/imx7/warp7/include/platform_def.h b/plat/imx/imx7/warp7/include/platform_def.h
index 27429c7af..d0148f422 100644
--- a/plat/imx/imx7/warp7/include/platform_def.h
+++ b/plat/imx/imx7/warp7/include/platform_def.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLATFORM_DEF_H__
-#define __PLATFORM_DEF_H__
+#ifndef PLATFORM_DEF_H
+#define PLATFORM_DEF_H
 
 #include <arch.h>
 #include <common_def.h>
@@ -214,4 +214,4 @@
  */
 #define SYS_COUNTER_FREQ_IN_TICKS	8000000		/* 8 MHz */
 
-#endif /* __PLATFORM_DEF_H__ */
+#endif /* PLATFORM_DEF_H */
diff --git a/plat/imx/imx7/warp7/warp7_private.h b/plat/imx/imx7/warp7/warp7_private.h
index c93acacf4..cb6d90015 100644
--- a/plat/imx/imx7/warp7/warp7_private.h
+++ b/plat/imx/imx7/warp7/warp7_private.h
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __WARP7_PRIVATE_H__
-#define __WARP7_PRIVATE_H__
+#ifndef WARP7_PRIVATE_H
+#define WARP7_PRIVATE_H
 
 /*******************************************************************************
  * Function and variable prototypes
  ******************************************************************************/
 void plat_warp7_io_setup(void);
 
-#endif /*__WARP7_PRIVATE_H__ */
+#endif /* WARP7_PRIVATE_H */