Merge pull request #1673 from antonio-nino-diaz-arm/an/headers

Standardise header guards across codebase

plat/arm/board/sgm775/include/platform_def.h

@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLATFORM_DEF_H__
-#define __PLATFORM_DEF_H__
+#ifndef PLATFORM_DEF_H
+#define PLATFORM_DEF_H
 
 #include <sgm_base_platform_def.h>
 
 #define PLAT_MAX_CPUS_PER_CLUSTER	8
 #define PLAT_MAX_PE_PER_CPU		1
 
-#endif /* __PLATFORM_DEF_H__ */
+#endif /* PLATFORM_DEF_H */

plat/arm/css/drivers/mhu/css_mhu.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CSS_MHU_H__
-#define __CSS_MHU_H__
+#ifndef CSS_MHU_H
+#define CSS_MHU_H
 
 #include <stdint.h>
 
@@ -16,4 +16,4 @@ void mhu_secure_message_end(unsigned int slot_id);
 
 void mhu_secure_init(void);
 
-#endif	/* __CSS_MHU_H__ */
+#endif /* CSS_MHU_H */

plat/arm/css/drivers/scmi/scmi.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CSS_SCMI_H__
-#define __CSS_SCMI_H__
+#ifndef SCMI_H
+#define SCMI_H
 
 #include <bakery_lock.h>
 #include <stddef.h>
@@ -162,4 +162,4 @@ int scmi_ap_core_get_reset_addr(void *p, uint64_t *reset_addr, uint32_t *attr);
 /* API to get the platform specific SCMI channel information. */
 scmi_channel_plat_info_t *plat_css_get_scmi_info();
 
-#endif	/* __CSS_SCMI_H__ */
+#endif /* SCMI_H */

plat/arm/css/drivers/scmi/scmi_private.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CSS_SCMI_PRIVATE_H__
-#define __CSS_SCMI_PRIVATE_H__
+#ifndef SCMI_PRIVATE_H
+#define SCMI_PRIVATE_H
 
 /*
  * SCMI power domain management protocol message and response lengths. It is
@@ -150,4 +150,4 @@ static inline void validate_scmi_channel(scmi_channel_t *ch)
 	assert(ch->info && ch->info->scmi_mbx_mem);
 }
 
-#endif	/* __CSS_SCMI_PRIVATE_H__ */
+#endif /* SCMI_PRIVATE_H */

plat/arm/css/drivers/scp/css_scp.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CSS_SCP_H__
-#define __CSS_SCP_H__
+#ifndef CSS_SCP_H
+#define CSS_SCP_H
 
 #include <cassert.h>
 #include <platform_def.h>
@@ -47,4 +47,4 @@ CASSERT(SCP_BL2_BASE >= ARM_TB_FW_CONFIG_LIMIT, assert_scp_bl2_overflow);
 CASSERT(SCP_BL2U_BASE >= ARM_TB_FW_CONFIG_LIMIT, assert_scp_bl2u_overflow);
 #endif
 
-#endif	/* __CSS_SCP_H__ */
+#endif /* CSS_SCP_H */

plat/arm/css/drivers/scpi/css_scpi.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CSS_SCPI_H__
-#define __CSS_SCPI_H__
+#ifndef CSS_SCPI_H
+#define CSS_SCPI_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -106,5 +106,4 @@ int scpi_get_css_power_state(unsigned int mpidr, unsigned int *cpu_state_p,
 		unsigned int *cluster_state_p);
 uint32_t scpi_sys_power_state(scpi_system_state_t system_state);
 
-
-#endif	/* __CSS_SCPI_H__ */
+#endif /* CSS_SCPI_H */

plat/arm/css/drivers/sds/sds.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SDS_H__
-#define __SDS_H__
+#ifndef SDS_H
+#define SDS_H
 
 /* SDS Structure Identifier defines */
 /* AP CPU INFO defines */
@@ -86,4 +86,5 @@ int sds_struct_read(uint32_t structure_id, unsigned int fld_off, void *data,
 int sds_struct_write(uint32_t structure_id, unsigned int fld_off, void *data,
 		size_t size, sds_access_mode_t mode);
 #endif /*__ASSEMBLY__ */
-#endif /* __SDS_H__ */
+
+#endif /* SDS_H */

plat/arm/css/drivers/sds/sds_private.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SDS_PRIVATE_H__
-#define __SDS_PRIVATE_H__
+#ifndef SDS_PRIVATE_H
+#define SDS_PRIVATE_H
 
 /* SDS Header defines */
 #define SDS_HEADER_ID_SHIFT			0
@@ -96,4 +96,5 @@ typedef struct region_descriptor {
 #define GET_SDS_REGION_SIZE(region)		((((region_desc_t *)(region))->reg[1]))
 
 #endif /* __ASSEMBLY__ */
-#endif /* __SDS_PRIVATE_H__ */
+
+#endif /* SDS_PRIVATE_H */

plat/arm/css/sgi/include/plat_macros.S

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __PLAT_MACROS_S__
-#define __PLAT_MACROS_S__
+#ifndef PLAT_MACROS_S
+#define PLAT_MACROS_S
 
 #include <css_macros.S>
 
@@ -20,4 +20,5 @@
  */
 	.macro plat_crash_print_regs
 	.endm
-#endif /* __PLAT_MACROS_S__ */
+
+#endif /* PLAT_MACROS_S */

plat/arm/css/sgi/include/sgi_ras.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SGI_RAS__
-#define __SGI_RAS__
+#ifndef SGI_RAS_H
+#define SGI_RAS_H
 
 /*
  * Mapping the RAS interrupt with SDEI event number and the event
@@ -19,4 +19,4 @@ struct sgi_ras_ev_map {
 
 int sgi_ras_intr_handler_setup(void);
 
-#endif /* __SGI_RAS__ */
+#endif /* SGI_RAS_H */

plat/arm/css/sgm/include/plat_macros.S

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __PLAT_MACROS_S__
-#define __PLAT_MACROS_S__
+#ifndef PLAT_MACROS_S
+#define PLAT_MACROS_S
 
 #include <cci_macros.S>
 #include <css_macros.S>
@@ -21,4 +21,4 @@ css_print_gic_regs
 print_cci_regs
 .endm
 
-#endif /* __PLAT_MACROS_S__ */
+#endif /* PLAT_MACROS_S */

plat/arm/css/sgm/include/sgm_base_platform_def.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SGM_BASE_PLATFORM_DEF_H__
-#define __SGM_BASE_PLATFORM_DEF_H__
+#ifndef SGM_BASE_PLATFORM_DEF_H
+#define SGM_BASE_PLATFORM_DEF_H
 
 #include <arm_def.h>
 #include <board_css_def.h>
@@ -239,4 +239,4 @@
  */
 #define PLAT_ARM_MEM_PROT_ADDR		(V2M_FLASH0_BASE + \
 					 V2M_FLASH0_SIZE - V2M_FLASH_BLOCK_SIZE)
-#endif /* __SGM_BASE_PLATFORM_DEF_H__ */
+#endif /* SGM_BASE_PLATFORM_DEF_H */

plat/arm/css/sgm/include/sgm_plat_config.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SGM_PLAT_CONFIG_H__
-#define __SGM_PLAT_CONFIG_H__
+#ifndef SGM_PLAT_CONFIG_H
+#define SGM_PLAT_CONFIG_H
 
 #include <ccn.h>
 #include <gicv3.h>
@@ -39,4 +39,5 @@ typedef struct css_plat_config {
 
 void plat_config_init(void);
 css_plat_config_t *get_plat_config(void);
-#endif /* __SGM_PLAT_CONFIG_H__ */
+
+#endif /* SGM_PLAT_CONFIG_H */

plat/arm/css/sgm/include/sgm_variant.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SGM_VARIANT_H__
-#define __SGM_VARIANT_H__
+#ifndef SGM_VARIANT_H
+#define SGM_VARIANT_H
 
 /* SSC_VERSION values for sgm */
 #define SGM775_SSC_VER_PART_NUM		0x0790
@@ -14,4 +14,4 @@
 #define SGM_DMC_SIZE			0x40000
 #define SGM775_DMC_COUNT		4
 
-#endif /* __SGM_VARIANT_H__ */
+#endif /* SGM_VARIANT_H */

plat/hisilicon/hikey/hikey_private.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __HIKEY_PRIVATE_H__
-#define __HIKEY_PRIVATE_H__
+#ifndef HIKEY_PRIVATE_H
+#define HIKEY_PRIVATE_H
 
 #include <bl_common.h>
 
@@ -72,4 +72,4 @@ int hikey_write_serialno(struct random_serial_num *serialno);
 
 void init_acpu_dvfs(void);
 
-#endif /* __HIKEY_PRIVATE_H__ */
+#endif /* HIKEY_PRIVATE_H */

plat/hisilicon/hikey/include/hi6220.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __HI6220_H__
-#define __HI6220_H__
+#ifndef HI6220_H
+#define HI6220_H
 
 #include <hi6220_regs_acpu.h>
 #include <hi6220_regs_ao.h>
@@ -74,4 +74,4 @@
 #define GPIO18_BASE				0xF702E000
 #define GPIO19_BASE				0xF702F000
 
-#endif	/* __HI6220_H__ */
+#endif /* HI6220_H */

plat/hisilicon/hikey/include/hi6220_regs_acpu.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __HI6220_REGS_ACPU_H__
-#define __HI6220_REGS_ACPU_H__
+#ifndef HI6220_REGS_ACPU_H
+#define HI6220_REGS_ACPU_H
 
 #define ACPU_CTRL_BASE				0xF6504000
 
@@ -297,4 +297,4 @@
 	 (0x1 << ACPU_SC_VD_CTRL_TUNE_EN_INT_SHIFT) |		\
 	 (0x1 << ACPU_SC_VD_CTRL_TUNE_EN_DIF_SHIFT))
 
-#endif /* __HI6220_REGS_ACPU_H__ */
+#endif /* HI6220_REGS_ACPU_H */

plat/hisilicon/hikey/include/hi6220_regs_ao.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __HI6220_AO_H__
-#define __HI6220_AO_H__
+#ifndef HI6220_REGS_AO_H
+#define HI6220_REGS_AO_H
 
 #define AO_CTRL_BASE				0xF7800000
 
@@ -331,4 +331,4 @@
 #define PCLK_TIMER1						(1 << 16)
 #define PCLK_TIMER0						(1 << 15)
 
-#endif /* __HI6220_AO_H__ */
+#endif /* HI6220_REGS_AO_H */

plat/hisilicon/hikey/include/hi6220_regs_peri.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __HI6220_PERI_H__
-#define __HI6220_PERI_H__
+#ifndef HI6220_REGS_PERI_H
+#define HI6220_REGS_PERI_H
 
 #define PERI_BASE				0xF7030000
 
@@ -377,4 +377,4 @@
 #define PERI_RST8_DDRPACK_APB			(1 << 14)
 #define PERI_RST8_DDRT				(1 << 17)
 
-#endif /* __HI6220_PERI_H__ */
+#endif /* HI6220_REGS_PERI_H */

plat/hisilicon/hikey/include/hi6220_regs_pin.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __HI6220_PIN_H__
-#define __HI6220_PIN_H__
+#ifndef HI6220_REGS_PIN_H
+#define HI6220_REGS_PIN_H
 
 #define IOMG_BASE				0xF7010000
 
@@ -40,4 +40,4 @@
 #define IOCG_PULLDOWN				(1 << 1)
 #define IOCG_PULLUP				(1 << 0)
 
-#endif	/* __HI6220_PIN_H__ */
+#endif /* HI6220_REGS_PIN_H */