9 files changed, 27 insertions, 27 deletions
diff --git a/plat/layerscape/board/ls1043/include/ns_access.h b/plat/layerscape/board/ls1043/include/ns_access.h
index 6ed7bc00..833a5df0 100644
--- a/plat/layerscape/board/ls1043/include/ns_access.h
+++ b/plat/layerscape/board/ls1043/include/ns_access.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __FSL_NS_ACCESS_H_
-#define __FSL_NS_ACCESS_H_
+#ifndef NS_ACCESS_H
+#define NS_ACCESS_H
 
 #include "fsl_csu.h"
 
@@ -171,4 +171,4 @@ static struct csu_ns_dev ns_dev[] = {
 	 {CSU_CSLX_DSCR, CSU_ALL_RW},
 };
 
-#endif
+#endif /* NS_ACCESS_H */
diff --git a/plat/layerscape/board/ls1043/include/plat_macros.S b/plat/layerscape/board/ls1043/include/plat_macros.S
index 8163dc16..1ae43ef3 100644
--- a/plat/layerscape/board/ls1043/include/plat_macros.S
+++ b/plat/layerscape/board/ls1043/include/plat_macros.S
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_MACROS_S__
-#define __PLAT_MACROS_S__
+#ifndef PLAT_MACROS_S
+#define PLAT_MACROS_S
 
 	/* ---------------------------------------------
 	 * The below required platform porting macro
@@ -18,4 +18,4 @@
 	.macro plat_crash_print_regs
 	.endm
 
-#endif /* __PLAT_MACROS_S__ */
+#endif /* PLAT_MACROS_S */
diff --git a/plat/layerscape/board/ls1043/include/soc_tzasc.h b/plat/layerscape/board/ls1043/include/soc_tzasc.h
index 0039f2d3..b2483d98 100644
--- a/plat/layerscape/board/ls1043/include/soc_tzasc.h
+++ b/plat/layerscape/board/ls1043/include/soc_tzasc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef _SOC_TZASC_H_
-#define _SOC_TZASC_H_
+#ifndef SOC_TZASC_H
+#define SOC_TZASC_H
 
 #include "tzc380.h"
 
@@ -90,4 +90,4 @@ static const struct tzc380_reg tzc380_reg_list[] = {
 	{}
 };
 
-#endif /* _SOC_TZASC_H_ */
+#endif /* SOC_TZASC_H */
diff --git a/plat/layerscape/common/include/fsl_csu.h b/plat/layerscape/common/include/fsl_csu.h
index 680911ef..5cc88b13 100644
--- a/plat/layerscape/common/include/fsl_csu.h
+++ b/plat/layerscape/common/include/fsl_csu.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __FSL_CSU_H__
-#define __FSL_CSU_H__
+#ifndef FSL_CSU_H
+#define FSL_CSU_H
 
 enum csu_cslx_access {
 	CSU_NS_SUP_R = 0x08,
@@ -30,4 +30,4 @@ struct csu_ns_dev {
 
 void enable_layerscape_ns_access(void);
 
-#endif
+#endif /* FSL_CSU_H */
diff --git a/plat/layerscape/common/include/ls_16550.h b/plat/layerscape/common/include/ls_16550.h
index 8daafbb4..94694eef 100644
--- a/plat/layerscape/common/include/ls_16550.h
+++ b/plat/layerscape/common/include/ls_16550.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __LS_16550_H__
-#define __LS_16550_H__
+#ifndef LS_16550_H
+#define LS_16550_H
 
 #include <console.h>
 
@@ -83,4 +83,4 @@ int console_ls_16550_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud,
 
 #endif /*__ASSEMBLY__*/
 
-#endif	/* __LS_16550_H__ */
+#endif /* LS_16550_H */
diff --git a/plat/layerscape/common/include/plat_ls.h b/plat/layerscape/common/include/plat_ls.h
index 05b9c053..49526ca8 100644
--- a/plat/layerscape/common/include/plat_ls.h
+++ b/plat/layerscape/common/include/plat_ls.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_LS_H__
-#define __PLAT_LS_H__
+#ifndef PLAT_LS_H
+#define PLAT_LS_H
 
 #include <cpu_data.h>
 #include <stdint.h>
@@ -58,4 +58,4 @@ unsigned int plat_ls_calc_core_pos(u_register_t mpidr);
 /* others */
 unsigned int plat_ls_get_cluster_core_count(u_register_t mpidr);
 
-#endif /* __PLAT_LS_H__ */
+#endif /* PLAT_LS_H */
diff --git a/plat/layerscape/common/include/soc.h b/plat/layerscape/common/include/soc.h
index 72c10cf9..76c34189 100644
--- a/plat/layerscape/common/include/soc.h
+++ b/plat/layerscape/common/include/soc.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __LAYERSCAPE_SOC_H__
-#define __LAYERSCAPE_SOC_H__
+#ifndef SOC_H
+#define SOC_H
 
 #include <stdint.h>
 
@@ -15,4 +15,4 @@
 
 void get_gic_offset(uint32_t *gicc_base, uint32_t *gicd_base);
 
-#endif /* __LAYERSCAPE_SOC_H__ */
+#endif /* SOC_H */
diff --git a/plat/layerscape/common/include/tzc380.h b/plat/layerscape/common/include/tzc380.h
index 788c0ed1..88063a97 100644
--- a/plat/layerscape/common/include/tzc380.h
+++ b/plat/layerscape/common/include/tzc380.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TZC380_H__
-#define __TZC380_H__
+#ifndef TZC380_H
+#define TZC380_H
 
 struct tzc380_reg {
 	unsigned int secure;
@@ -16,4 +16,4 @@ struct tzc380_reg {
 	unsigned int sub_mask;
 };
 
-#endif /* __TZC380_H__ */
+#endif /* TZC380_H */
diff --git a/plat/layerscape/common/tsp/platform_tsp.h b/plat/layerscape/common/tsp/platform_tsp.h
index b1c96cbb..260f66ac 100644
--- a/plat/layerscape/common/tsp/platform_tsp.h
+++ b/plat/layerscape/common/tsp/platform_tsp.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLATFORM_TSP_H__
-#define __PLATFORM_TSP_H__
+#ifndef PLATFORM_TSP_H
+#define PLATFORM_TSP_H
 
 /*******************************************************************************
  * Mandatory TSP functions (only if platform contains a TSP)
@@ -14,4 +14,4 @@ void tsp_early_platform_setup(void);
 void tsp_plat_arch_setup(void);
 void tsp_platform_setup(void);
 
-#endif /* __PLATFORM_TSP_H__ */
+#endif /* PLATFORM_TSP_H */