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

Standardise header guards across codebase

plat/marvell/common/mss/mss_scp_bootloader.h

@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __MSS_SCP_BOOTLOADER_H__
-#define __MSS_SCP_BOOTLOADER_H__
+#ifndef MSS_SCP_BOOTLOADER_H
+#define MSS_SCP_BOOTLOADER_H
 
 int scp_bootloader_transfer(void *image, unsigned int image_size);
 uintptr_t bl2_plat_get_cp_mss_regs(int ap_idx, int cp_idx);
@@ -16,4 +16,4 @@ uint32_t bl2_plat_get_ap_count(void);
 void bl2_plat_configure_mss_windows(uintptr_t mss_regs);
 int bl2_plat_mss_check_image_ready(void);
 
-#endif /* __MSS_SCP_BOOTLOADER_H__ */
+#endif /* MSS_SCP_BOOTLOADER_H */

plat/mediatek/common/custom/oem_svc.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __OEM_SVC_H__
-#define __OEM_SVC_H__
+#ifndef OEM_SVC_H
+#define OEM_SVC_H
 
 /*******************************************************************************
  * Defines for runtime services func ids
@@ -41,4 +41,4 @@
 #define OEM_SVC_E_NOT_SUPPORTED		-1
 #define OEM_SVC_E_INVALID_PARAMS	-2
 
-#endif /* __OEM_SVC_H__ */
+#endif /* OEM_SVC_H */

plat/mediatek/common/drivers/uart/uart8250.h

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __UART8250_H__
-#define __UART8250_H__
+#ifndef UART8250_H
+#define UART8250_H
 
 /* UART register */
 #define UART_RBR		0x00	/* Receive buffer register */
@@ -35,4 +35,4 @@
 #define UART_LSR_DR		0x01	/* Data ready */
 #define UART_LSR_THRE		0x20	/* Xmit holding register empty */
 
-#endif	/* __UART8250_H__ */
+#endif /* UART8250_H */

plat/mediatek/common/mtk_plat_common.h

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __MTK_PLAT_COMMON_H__
-#define __MTK_PLAT_COMMON_H__
+#ifndef MTK_PLAT_COMMON_H
+#define MTK_PLAT_COMMON_H
 
 #include <bl_common.h>
 #include <param_header.h>
@@ -74,4 +74,4 @@ uint64_t get_kernel_info_r1(void);
 uint64_t get_kernel_info_r2(void);
 
 extern struct atf_arg_t gteearg;
-#endif
+#endif /* MTK_PLAT_COMMON_H */

plat/mediatek/common/mtk_sip_svc.h

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __PLAT_SIP_SVC_H__
-#define __PLAT_SIP_SVC_H__
+#ifndef MTK_SIP_SVC_H
+#define MTK_SIP_SVC_H
 
 #include <stdint.h>
 
@@ -50,4 +50,4 @@ enum {
  */
 uint64_t mt_sip_set_authorized_sreg(uint32_t sreg, uint32_t val);
 
-#endif /* __PLAT_SIP_SVC_H__ */
+#endif /* MTK_SIP_SVC_H */

plat/mediatek/mt6795/drivers/timer/mt_cpuxgpt.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __MT_CPUXGPT_H__
-#define __MT_CPUXGPT_H__
+#ifndef MT_CPUXGPT_H
+#define MT_CPUXGPT_H
 
 /* REG */
 #define INDEX_CTL_REG       0x000
@@ -25,4 +25,4 @@ void generic_timer_backup(void);
 void sched_clock_init(uint64_t normal_base, uint64_t atf_base);
 uint64_t sched_clock(void);
 
-#endif /* __MT_CPUXGPT_H__ */
+#endif /* MT_CPUXGPT_H */

plat/mediatek/mt6795/include/mcucfg.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __MCUCFG_H__
-#define __MCUCFG_H__
+#ifndef MCUCFG_H
+#define MCUCFG_H
 
 #include <platform_def.h>
 #include <stdint.h>
@@ -151,4 +151,4 @@ enum {
 	MP1_L2RSTDISABLE = 1 << MP1_L2RSTDISABLE_SHIFT
 };
 
-#endif  /* __MCUCFG_H__ */
+#endif  /* MCUCFG_H */

plat/mediatek/mt6795/include/plat_private.h

@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_PRIVATE_H__
-#define __PLAT_PRIVATE_H__
+#ifndef PLAT_PRIVATE_H
+#define PLAT_PRIVATE_H
+
 #include <stdint.h>
 #include <xlat_tables.h>
 
@@ -33,4 +34,4 @@ void plat_mt_gic_cpuif_enable(void);
 void plat_mt_gic_cpuif_disable(void);
 void plat_mt_gic_pcpu_init(void);
 
-#endif /* __PLAT_PRIVATE_H__ */
+#endif /* PLAT_PRIVATE_H */

plat/mediatek/mt6795/include/plat_sip_calls.h

@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_SIP_CALLS_H__
-#define __PLAT_SIP_CALLS_H__
+#ifndef PLAT_SIP_CALLS_H
+#define PLAT_SIP_CALLS_H
 
 /*******************************************************************************
  * Plat SiP function constants
  ******************************************************************************/
 #define MTK_PLAT_SIP_NUM_CALLS	0
 
-#endif /* __PLAT_SIP_CALLS_H__ */
+#endif /* PLAT_SIP_CALLS_H */

plat/mediatek/mt6795/include/power_tracer.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __POWER_TRACER_H__
-#define __POWER_TRACER_H__
+#ifndef POWER_TRACER_H
+#define POWER_TRACER_H
 
 #define CPU_UP		0
 #define CPU_DOWN	1
@@ -16,4 +16,4 @@
 
 void trace_power_flow(unsigned long mpidr, unsigned char mode);
 
-#endif
+#endif /* POWER_TRACER_H */

plat/mediatek/mt6795/include/scu.h

@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SCU_H__
-#define __SCU_H__
+#ifndef SCU_H
+#define SCU_H
 
 void disable_scu(unsigned long mpidr);
 void enable_scu(unsigned long mpidr);
 
-#endif
+#endif /* SCU_H */

plat/mediatek/mt6795/include/spm.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SPM_H__
-#define __SPM_H__
+#ifndef SPM_H
+#define SPM_H
 
 #define SPM_POWERON_CONFIG_SET			(SPM_BASE + 0x000)
 #define SPM_POWER_ON_VAL0			(SPM_BASE + 0x010)
@@ -195,4 +195,4 @@
 #define WAKE_SRC_ALL_MD32	(1 << 28)
 #define WAKE_SRC_CPU_IRQ	(1 << 29)
 
-#endif /* __SPM_H__ */
+#endif /* SPM_H */

plat/mediatek/mt8173/drivers/crypt/crypt.h

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __CRYPT_H__
-#define __CRYPT_H__
+#ifndef CRYPT_H
+#define CRYPT_H
 
 #include <stdint.h>
 
@@ -13,4 +13,4 @@ uint64_t crypt_set_hdcp_key_ex(uint64_t x1, uint64_t x2, uint64_t x3);
 uint64_t crypt_set_hdcp_key_num(uint32_t num);
 uint64_t crypt_clear_hdcp_key(void);
 
-#endif /* __CRYPT_H__ */
+#endif /* CRYPT_H */

plat/mediatek/mt8173/drivers/mtcmos/mtcmos.h

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __MTCMOS_H__
-#define __MTCMOS_H__
+#ifndef MTCMOS_H
+#define MTCMOS_H
 
 /*
  * This function will turn off all the little core's power except cpu 0. The
@@ -15,4 +15,4 @@
 void mtcmos_little_cpu_off(void);
 uint32_t mtcmos_non_cpu_ctrl(uint32_t on, uint32_t mtcmos_num);
 
-#endif /* __MTCMOS_H__ */
+#endif /* MTCMOS_H */

plat/mediatek/mt8173/drivers/pmic/pmic_wrap_init.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PMIC_WRAP_INIT_H__
-#define __PMIC_WRAP_INIT_H__
+#ifndef PMIC_WRAP_INIT_H
+#define PMIC_WRAP_INIT_H
 
 /* external API */
 int32_t pwrap_read(uint32_t adr, uint32_t *rdata);
@@ -164,4 +164,4 @@ enum {
 	E_PWR_SWITCH_DIO              = 32
 };
 
-#endif /* __PMIC_WRAP_INIT_H__ */
+#endif /* PMIC_WRAP_INIT_H */

plat/mediatek/mt8173/drivers/rtc/rtc.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLAT_DRIVER_RTC_H__
-#define __PLAT_DRIVER_RTC_H__
+#ifndef RTC_H
+#define RTC_H
 
 /* RTC registers */
 enum {
@@ -51,4 +51,4 @@ enum {
 
 void rtc_bbpu_power_down(void);
 
-#endif /* __PLAT_DRIVER_RTC_H__ */
+#endif /* RTC_H */

plat/mediatek/mt8173/drivers/spm/spm.h

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __SPM_H__
-#define __SPM_H__
+#ifndef SPM_H
+#define SPM_H
 
 #define SPM_POWERON_CONFIG_SET			(SPM_BASE + 0x000)
 #define SPM_POWER_ON_VAL0			(SPM_BASE + 0x010)
@@ -333,4 +333,4 @@ void spm_lock_get(void);
 void spm_lock_release(void);
 void spm_boot_init(void);
 
-#endif /* __SPM_H__ */
+#endif /* SPM_H */

plat/mediatek/mt8173/drivers/spm/spm_hotplug.h

@@ -3,11 +3,11 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __SPM_HOTPLUG_H__
-#define __SPM_HOTPLUG_H__
+#ifndef SPM_HOTPLUG_H
+#define SPM_HOTPLUG_H
 
 void spm_clear_hotplug(void);
 void spm_hotplug_off(unsigned long mpidr);
 void spm_hotplug_on(unsigned long mpidr);
 
-#endif /* __SPM_HOTPLUG_H__ */
+#endif /* SPM_HOTPLUG_H */

plat/mediatek/mt8173/drivers/spm/spm_mcdi.h

@@ -3,12 +3,12 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __SPM_MCDI_H__
-#define __SPM_MCDI_H__
+#ifndef SPM_MCDI_H
+#define SPM_MCDI_H
 
 void spm_mcdi_wakeup_all_cores(void);
 void spm_mcdi_prepare_for_mtcmos(void);
 void spm_mcdi_prepare_for_off_state(unsigned long mpidr, unsigned int afflvl);
 void spm_mcdi_finish_for_on_state(unsigned long mpidr, unsigned int afflvl);
 
-#endif /* __SPM_MCDI_H__ */
+#endif /* SPM_MCDI_H */

plat/mediatek/mt8173/drivers/spm/spm_suspend.h

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __SPM_SUSPEND_H__
-#define __SPM_SUSPEND_H__
+#ifndef SPM_SUSPEND_H
+#define SPM_SUSPEND_H
 
 /* cpu dormant return code */
 #define CPU_DORMANT_RESET        0
@@ -13,4 +13,4 @@
 void spm_system_suspend(void);
 void spm_system_suspend_finish(void);
 
-#endif /* __SPM_SUSPEND_H__*/
+#endif /* SPM_SUSPEND_H*/