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

Standardise header guards across codebase

bl1/bl1_private.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __BL1_PRIVATE_H__
+#ifndef BL1_PRIVATE_H
-#define __BL1_PRIVATE_H__
+#define BL1_PRIVATE_H
 
 #include <stdint.h>
 #include <utils_def.h>
@@ -35,4 +35,4 @@ register_t bl1_fwu_smc_handler(unsigned int smc_fid,
 		void *cookie,
 		void *handle,
 		unsigned int flags);
-#endif /* __BL1_PRIVATE_H__ */
+#endif /* BL1_PRIVATE_H */

bl2/bl2_private.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __BL2_PRIVATE_H__
+#ifndef BL2_PRIVATE_H
-#define __BL2_PRIVATE_H__
+#define BL2_PRIVATE_H
 
 #if BL2_IN_XIP_MEM
 /*******************************************************************************
@@ -33,4 +33,4 @@ void bl2_arch_setup(void);
 struct entry_point_info *bl2_load_images(void);
 void bl2_run_next_image(const struct entry_point_info *bl_ep_info);
 
-#endif /* __BL2_PRIVATE_H__ */
+#endif /* BL2_PRIVATE_H */

bl32/sp_min/sp_min_private.h

@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SP_MIN_H__
+#ifndef SP_MIN_PRIVATE_H
-#define __SP_MIN_H__
+#define SP_MIN_PRIVATE_H
 
 void sp_min_warm_entrypoint(void);
 void sp_min_main(void);
 void sp_min_warm_boot(void);
 void sp_min_fiq(void);
 
-#endif /* __SP_MIN_H__ */
+#endif /* SP_MIN_PRIVATE_H */

bl32/tsp/tsp_private.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TSP_PRIVATE_H__
+#ifndef TSP_PRIVATE_H
-#define __TSP_PRIVATE_H__
+#define TSP_PRIVATE_H
 
 /* Definitions to help the assembler access the SMC/ERET args structure */
 #define TSP_ARGS_SIZE		0x40
@@ -149,5 +149,4 @@ tsp_args_t *tsp_system_off_main(uint64_t arg0,
 uint64_t tsp_main(void);
 #endif /* __ASSEMBLY__ */
 
-#endif /* __TSP_PRIVATE_H__ */
+#endif /* TSP_PRIVATE_H */
-

drivers/arm/ccn/ccn_private.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CCN_PRIVATE_H__
+#ifndef CCN_PRIVATE_H
-#define __CCN_PRIVATE_H__
+#define CCN_PRIVATE_H
 
 /*
  * A CCN implementation can have a maximum of 64 Request nodes with node IDs
@@ -230,4 +230,4 @@ static inline unsigned int count_set_bits(unsigned long long bitmap)
 #define CCN_GET_HN_NODEID_MAP(periphbase, mn_hn_id_reg_offset)		\
 	ccn_reg_read(periphbase, MN_REGION_ID, mn_hn_id_reg_offset)
 
-#endif /* __CCN_PRIVATE_H__ */
+#endif /* CCN_PRIVATE_H */

drivers/arm/gic/common/gic_common_private.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef GIC_COMMON_PRIVATE_H_
+#ifndef GIC_COMMON_PRIVATE_H
-#define GIC_COMMON_PRIVATE_H_
+#define GIC_COMMON_PRIVATE_H
 
 #include <gic_common.h>
 #include <mmio.h>
@@ -85,4 +85,4 @@ void gicd_set_icactiver(uintptr_t base, unsigned int id);
 void gicd_set_ipriorityr(uintptr_t base, unsigned int id, unsigned int pri);
 void gicd_set_icfgr(uintptr_t base, unsigned int id, unsigned int cfg);
 
-#endif /* GIC_COMMON_PRIVATE_H_ */
+#endif /* GIC_COMMON_PRIVATE_H */

drivers/arm/gic/v2/gicv2_private.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __GICV2_PRIVATE_H__
+#ifndef GICV2_PRIVATE_H
-#define __GICV2_PRIVATE_H__
+#define GICV2_PRIVATE_H
 
 #include <gicv2.h>
 #include <mmio.h>
@@ -146,4 +146,4 @@ static inline void gicc_write_dir(uintptr_t base, unsigned int val)
 	mmio_write_32(base + GICC_DIR, val);
 }
 
-#endif /* __GICV2_PRIVATE_H__ */
+#endif /* GICV2_PRIVATE_H */

drivers/arm/gic/v3/gicv3_private.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __GICV3_PRIVATE_H__
+#ifndef GICV3_PRIVATE_H
-#define __GICV3_PRIVATE_H__
+#define GICV3_PRIVATE_H
 
 #include <assert.h>
 #include <gic_common.h>
@@ -387,4 +387,4 @@ static inline void gits_wait_for_quiescent_bit(uintptr_t gits_base)
 }
 
 
-#endif /* __GICV3_PRIVATE_H__ */
+#endif /* GICV3_PRIVATE_H */

drivers/imx/timer/imx_gpt.h

@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IMX_GPT_H__
+#ifndef IMX_GPT_H
-#define __IMX_GPT_H__
+#define IMX_GPT_H
 
 #include <stdint.h>
 
 void imx_gpt_ops_init(uintptr_t reg_base);
 
-#endif /* __IMX_GPT_H__ */
+#endif /* IMX_GPT_H */

drivers/imx/uart/imx_uart.h

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __IMX_CONSOLE_H__
+#ifndef IMX_UART_H
-#define __IMX_CONSOLE_H__
+#define IMX_UART_H
 
 #define IMX_UART_RXD_OFFSET	0x00
 #define IMX_UART_RXD_CHARRDY	BIT(15)
@@ -150,4 +150,4 @@
 #define IMX_UART_TS_RXFULL	BIT(3)
 #define IMX_UART_TS_SOFTRST	BIT(0)
 
-#endif /* __IMX_UART_H__ */
+#endif /* IMX_UART_H */

drivers/imx/usdhc/imx_usdhc.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IMX_USDHC_H__
+#ifndef IMX_USDHC_H
-#define	__IMX_USDHC_H__
+#define IMX_USDHC_H
 
 #include <mmc.h>
 
@@ -134,4 +134,4 @@ void imx_usdhc_init(imx_usdhc_params_t *params,
 #define mmio_clrbits32(addr, clear)		mmio_write_32(addr, mmio_read_32(addr) & ~(clear))
 #define mmio_setbits32(addr, set)		mmio_write_32(addr, mmio_read_32(addr) | (set))
 
-#endif  /* __IMX_USDHC_H__ */
+#endif /* IMX_USDHC_H */

drivers/marvell/comphy.h

@@ -7,8 +7,8 @@
 
 /* Driver for COMPHY unit that is part or Marvell A8K SoCs */
 
-#ifndef _COMPHY_H_
+#ifndef COMPHY_H
-#define _COMPHY_H_
+#define COMPHY_H
 
 /* COMPHY registers */
 #define COMMON_PHY_CFG1_REG			0x0
@@ -469,5 +469,4 @@
 #define HPIPE_GLOBAL_PM_RXDLOZ_WAIT_MASK	\
 			(0xFF << HPIPE_GLOBAL_PM_RXDLOZ_WAIT_OFFSET)
 
-#endif /* _COMPHY_H_ */
+#endif /* COMPHY_H */
-

drivers/marvell/comphy/comphy-cp110.h

@@ -7,8 +7,8 @@
 
 /* Marvell CP110 SoC COMPHY unit driver */
 
-#ifndef _PHY_COMPHY_CP110_H
+#ifndef COMPHY_CP110_H
-#define _PHY_COMPHY_CP110_H
+#define COMPHY_CP110_H
 
 #define SD_ADDR(base, lane)			(base + 0x1000 * lane)
 #define HPIPE_ADDR(base, lane)			(SD_ADDR(base, lane) + 0x800)
@@ -862,5 +862,4 @@
 /* General defines */
 #define PLL_LOCK_TIMEOUT			15000
 
-#endif /* _PHY_COMPHY_CP110_H */
+#endif /* COMPHY_CP110_H */
-

drivers/marvell/comphy/phy-comphy-3700.h

@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef _PHY_COMPHY_3700_H
+#ifndef PHY_COMPHY_3700_H
-#define _PHY_COMPHY_3700_H
+#define PHY_COMPHY_3700_H
 
 #define PLL_SET_DELAY_US			600
 #define COMPHY_PLL_TIMEOUT			1000
@@ -255,4 +255,4 @@ enum {
 int mvebu_3700_comphy_is_pll_locked(uint8_t comphy_index, uint32_t comphy_mode);
 int mvebu_3700_comphy_power_off(uint8_t comphy_index, uint32_t comphy_mode);
 int mvebu_3700_comphy_power_on(uint8_t comphy_index, uint32_t comphy_mode);
-#endif /* _PHY_COMPHY_3700_H */
+#endif /* PHY_COMPHY_3700_H */

drivers/marvell/comphy/phy-comphy-common.h

@@ -7,8 +7,8 @@
 
 /* Marvell CP110 ana A3700 common */
 
-#ifndef _PHY_COMPHY_COMMON_H
+#ifndef PHY_COMPHY_COMMON_H
-#define _PHY_COMPHY_COMMON_H
+#define PHY_COMPHY_COMMON_H
 
 /* #define DEBUG_COMPHY */
 #ifdef DEBUG_COMPHY
@@ -153,4 +153,4 @@ static inline void __unused reg_set16(uintptr_t addr, uint16_t data,
 	debug("new val 0x%x\n", mmio_read_16(addr));
 }
 
-#endif /* _PHY_COMPHY_COMMON_H */
+#endif /* PHY_COMPHY_COMMON_H */

drivers/marvell/comphy/phy-default-porting-layer.h

@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __PHY_DEFAULT_PORTING_LAYER_H
+#ifndef PHY_DEFAULT_PORTING_LAYER_H
-#define __PHY_DEFAULT_PORTING_LAYER_H
+#define PHY_DEFAULT_PORTING_LAYER_H
 
 
 #define MAX_LANE_NR		6
@@ -48,4 +48,4 @@ static const struct sata_params
 		.valid = 0x1
 	},
 };
-#endif /* __PHY_DEFAULT_PORTING_LAYER_H */
+#endif /* PHY_DEFAULT_PORTING_LAYER_H */

drivers/marvell/mc_trustzone/mc_trustzone.h

@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef _MC_TRUSTZONE_H
+#ifndef MC_TRUSTZONE_H
-#define _MC_TRUSTZONE_H
+#define MC_TRUSTZONE_H
 
 #include <addr_map.h>
 
@@ -24,4 +24,4 @@
 
 void tz_enable_win(int ap_index, const struct addr_map_win *win, int win_id);
 
-#endif /* _MC_TRUSTZONE_H */
+#endif /* MC_TRUSTZONE_H */

drivers/marvell/uart/a3700_console.h

@@ -5,8 +5,8 @@
  * https://spdx.org/licenses
  */
 
-#ifndef __A3700_CONSOLE_H__
+#ifndef A3700_CONSOLE_H
-#define __A3700_CONSOLE_H__
+#define A3700_CONSOLE_H
 
 /* MVEBU UART Registers */
 #define UART_RX_REG		0x00
@@ -52,4 +52,4 @@
 #define UART_CTRL_TXFIFO_RESET	(1 << 15)
 #define UARTLSR_TXFIFOEMPTY	(1 << 6)
 
-#endif	/* __A3700_CONSOLE_H__ */
+#endif /* A3700_CONSOLE_H */

drivers/renesas/rcar/avs/avs_driver.h

@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef AVS_DRIVER_H__
+#ifndef AVS_DRIVER_H
-#define AVS_DRIVER_H__
+#define AVS_DRIVER_H
 
 /* AVS Setting. 1:enable / 0:disable */
 #ifndef AVS_SETTING_ENABLE
@@ -17,4 +17,4 @@ void rcar_avs_init(void);
 void rcar_avs_setting(void);
 void rcar_avs_end(void);
 
-#endif /* AVS_DRIVER_H__ */
+#endif /* AVS_DRIVER_H */

drivers/renesas/rcar/board/board.h

@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef BOARD_H_
+#ifndef BOARD_H
-#define BOARD_H_
+#define BOARD_H
 
 #define BOARD_SALVATOR_X		(0x00)
 #define BOARD_KRIEK			(0x01)
@@ -32,4 +32,4 @@ extern const char *g_board_tbl[];
 
 int32_t rcar_get_board_type(uint32_t *type, uint32_t *rev);
 
-#endif
+#endif /* BOARD_H */

drivers/renesas/rcar/console/rcar_printf.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef	RCAR_PRINTF_H__
+#ifndef RCAR_PRINTF_H
-#define	RCAR_PRINTF_H__
+#define RCAR_PRINTF_H
 
 #include <string.h>
 
@@ -16,4 +16,4 @@ int32_t rcar_log_init(void);
 extern uint64_t rcar_stack_generic_timer[5];
 #endif
 
-#endif
+#endif /* RCAR_PRINTF_H */

drivers/renesas/rcar/delay/micro_delay.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef MICRO_DELAY_H__
+#ifndef MICRO_DELAY_H
-#define MICRO_DELAY_H__
+#define MICRO_DELAY_H
 
 #define TMU3_MEASUREMENT	(0)
 
@@ -23,4 +23,4 @@ uint32_t tcnt3_snapshot(void);
 
 #endif
 
-#endif
+#endif /* MICRO_DELAY_H */

drivers/renesas/rcar/emmc/emmc_config.h

@@ -10,8 +10,8 @@
  *
  */
 
-#ifndef __EMMC_CONFIG_H__
+#ifndef EMMC_CONFIG_H
-#define __EMMC_CONFIG_H__
+#define EMMC_CONFIG_H
 
 /* ************************ HEADER (INCLUDE) SECTION *********************** */
 
@@ -36,5 +36,5 @@
 
 /* ********************************* CODE ********************************** */
 
-#endif /* #ifndef __EMMC_CONFIG_H__ */
+#endif /* EMMC_CONFIG_H */
 /* ******************************** END ************************************ */

drivers/renesas/rcar/emmc/emmc_def.h

@@ -10,8 +10,8 @@
  *
  */
 
-#ifndef __EMMC_DEF_H__
+#ifndef EMMC_DEF_H
-#define __EMMC_DEF_H__
+#define EMMC_DEF_H
 
 #include "emmc_std.h"
 
@@ -74,5 +74,5 @@ void emmc_write_error_info_func_no(uint16_t func_no);
 
 /* ********************************* CODE ********************************** */
 
-#endif /* #define __EMMC_DEF_H__ */
+#endif /* EMMC_DEF_H */
 /* ******************************** END ************************************ */

drivers/renesas/rcar/emmc/emmc_hal.h

@@ -10,8 +10,8 @@
  *
  */
 
-#ifndef __EMMC_HAL_H__
+#ifndef EMMC_HAL_H
-#define __EMMC_HAL_H__
+#define EMMC_HAL_H
 /* ************************ HEADER (INCLUDE) SECTION *********************** */
 #include <stdint.h>
 /* ***************** MACROS, CONSTANTS, COMPILATION FLAGS ****************** */
@@ -313,6 +313,6 @@ typedef struct {
 
 /* ********************************* CODE ********************************** */
 
-#endif /* __EMMC_HAL_H__ */
+#endif /* EMMC_HAL_H */
 
 /* ******************************** END ************************************ */

drivers/renesas/rcar/emmc/emmc_registers.h

@@ -10,8 +10,8 @@
  *
  */
 
-#ifndef __EMMC_REGISTERS_H__
+#ifndef EMMC_REGISTERS_H
-#define __EMMC_REGISTERS_H__
+#define EMMC_REGISTERS_H
 
 /* ************************ HEADER (INCLUDE) SECTION *********************** */
 
@@ -256,5 +256,5 @@
 
 /* ********************************* CODE ********************************** */
 
-#endif /* __EMMC_REGISTERS_H__ */
+#endif /* EMMC_REGISTERS_H */
 /* ******************************** END ************************************ */

drivers/renesas/rcar/emmc/emmc_std.h

@@ -10,8 +10,8 @@
  *
  */
 
-#ifndef __EMMC_STD_H__
+#ifndef EMMC_STD_H
-#define __EMMC_STD_H__
+#define EMMC_STD_H
 
 #include "emmc_hal.h"
 
@@ -471,4 +471,4 @@ uint32_t emmc_get_csd_time(void);
 /* ********************************* CODE ********************************** */
 
 /* ******************************** END ************************************ */
-#endif /* __EMMC_STD_H__ */
+#endif /* EMMC_STD_H */

drivers/renesas/rcar/iic_dvfs/iic_dvfs.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef IIC_DVFS_H__
+#ifndef IIC_DVFS_H
-#define IIC_DVFS_H__
+#define IIC_DVFS_H
 
 /* PMIC slave */
 #define PMIC			(0x30)
@@ -20,4 +20,4 @@
 int32_t rcar_iic_dvfs_receive(uint8_t slave, uint8_t reg, uint8_t *data);
 int32_t rcar_iic_dvfs_send(uint8_t slave, uint8_t regr, uint8_t data);
 
-#endif
+#endif /* IIC_DVFS_H */

drivers/renesas/rcar/io/io_common.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef IO_COMMON_H__
+#ifndef IO_COMMON_H
-#define IO_COMMON_H__
+#define IO_COMMON_H
 
 typedef struct io_drv_spec {
 	size_t offset;
@@ -13,4 +13,4 @@ typedef struct io_drv_spec {
 	uint32_t partition;
 } io_drv_spec_t;
 
-#endif
+#endif /* IO_COMMON_H */

drivers/renesas/rcar/io/io_emmcdrv.h

@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef IO_EMMCDRV_H__
+#ifndef IO_EMMCDRV_H
-#define IO_EMMCDRV_H__
+#define IO_EMMCDRV_H
 
 struct io_dev_connector;
 int32_t rcar_register_io_dev_emmcdrv(const io_dev_connector_t **connector);
 
-#endif
+#endif /* IO_EMMCDRV_H */

drivers/renesas/rcar/io/io_memdrv.h

@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef IO_MEMDRV_H__
+#ifndef IO_MEMDRV_H
-#define IO_MEMDRV_H__
+#define IO_MEMDRV_H
 
 struct io_dev_connector;
 int32_t rcar_register_io_dev_memdrv(const io_dev_connector_t **connector);
 
-#endif
+#endif /* IO_MEMDRV_H */

drivers/renesas/rcar/io/io_private.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef IO_PRIVATE_H_
+#ifndef IO_PRIVATE_H
-#define IO_PRIVATE_H_
+#define IO_PRIVATE_H
 
 /*
  * Return codes reported by 'io_*' APIs
@@ -17,4 +17,4 @@
 #define IO_NOT_SUPPORTED	(-0x82)
 #define IO_RESOURCES_EXHAUSTED	(-0x83)
 
-#endif
+#endif /* IO_PRIVATE_H */

drivers/renesas/rcar/io/io_rcar.h

@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef IO_RCAR_H__
+#ifndef IO_RCAR_H
-#define IO_RCAR_H__
+#define IO_RCAR_H
 
 int32_t rcar_register_io_dev(const io_dev_connector_t **dev_con);
 int32_t rcar_get_certificate(const int32_t name, uint32_t *cert);
 void rcar_read_certificate(uint64_t cert, uint32_t *size, uintptr_t *dest);
 
-#endif
+#endif /* IO_RCAR_H */

drivers/renesas/rcar/pwrc/pwrc.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef RCAR_PWRC_H__
+#ifndef PWRC_H
-#define RCAR_PWRC_H__
+#define PWRC_H
 
 #define PPOFFR_OFF		0x0
 #define PPONR_OFF		0x4
@@ -74,4 +74,4 @@ extern uint64_t rcar_stack_generic_timer[5];
 
 #endif
 
-#endif
+#endif /* PWRC_H */

drivers/renesas/rcar/rom/rom_api.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef ROM_API_H__
+#ifndef ROM_API_H
-#define ROM_API_H__
+#define ROM_API_H
 
 #include <stdint.h>
 
@@ -28,4 +28,4 @@ uint32_t rcar_rom_secure_boot_api(uint32_t *key, uint32_t *cert,
 				  rom_read_flash_f f);
 uint32_t rcar_rom_get_lcs(uint32_t *lcs);
 
-#endif
+#endif /* ROM_API_H */

drivers/renesas/rcar/rpc/rpc_registers.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef RPC_REGISTER_H__
+#ifndef RPC_REGISTERS_H
-#define RPC_REGISTER_H__
+#define RPC_REGISTERS_H
 
 #define RPC_BASE	(0xEE200000U)
 #define RPC_CMNCR	(RPC_BASE + 0x0000U)
@@ -22,4 +22,4 @@
 #define RPC_PHYCNT	(RPC_BASE + 0x007CU)
 #define RPC_PHYINT	(RPC_BASE + 0x0088U)
 
-#endif
+#endif /* RPC_REGISTERS_H */

drivers/staging/renesas/rcar/ddr/boot_init_dram.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef	__BOOT_INIT_DRAM_
+#ifndef BOOT_INIT_DRAM_H
-#define	__BOOT_INIT_DRAM_
+#define BOOT_INIT_DRAM_H
 
 extern int32_t rcar_dram_init(void);
 
@@ -15,4 +15,4 @@ extern int32_t rcar_dram_init(void);
 #define INITDRAM_ERR_O (0xfffffffe)
 #define INITDRAM_ERR_T (0xfffffff0)
 
-#endif
+#endif /* BOOT_INIT_DRAM_H */

drivers/staging/renesas/rcar/ddr/ddr_a/boot_init_dram_regdef_e3.h

@@ -4,13 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-
+#ifndef BOOT_INIT_DRAM_REGDEF_E3_H
-#ifndef BOOT_INIT_DRAM_REGDEF_E3_H_
+#define BOOT_INIT_DRAM_REGDEF_E3_H
-#define BOOT_INIT_DRAM_REGDEF_E3_H_
 
 #ifdef __cplusplus
 extern "C" {
-#endif				/* __cplusplus */
+#endif /* __cplusplus */
 
 #define				BIT0						0x00000001U
 #define				BIT11						0x00000800U
@@ -111,5 +110,6 @@ extern "C" {
 
 #ifdef __cplusplus
 }
-#endif				/* __cplusplus */
+#endif /* __cplusplus */
-#endif				/* BOOT_INIT_DRAM_REGDEF_E3_H_ */
+
+#endif /* BOOT_INIT_DRAM_REGDEF_E3_H */

drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.h

@@ -4,11 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#pragma once
+#ifndef DDR_INIT_E3_H
-#include <stdint.h>
+#define DDR_INIT_E3_H
 
-#ifndef	__DDR_INIT_E3_
+#include <stdint.h>
-#define	__DDR_INIT_E3_
 
 #define RCAR_E3_DDR_VERSION    "rev.0.09"
 
@@ -31,4 +30,4 @@ extern int32_t rcar_dram_init(void);
 #define INITDRAM_ERR_O (0xfffffffe)
 #define INITDRAM_ERR_T (0xfffffff0)
 
-#endif /* __DDR_INIT_E3_ */
+#endif /* DDR_INIT_E3_H */

drivers/staging/renesas/rcar/ddr/dram_sub_func.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef DRAM_SUB_FUNC_H_
+#ifndef DRAM_SUB_FUNC_H
-#define DRAM_SUB_FUNC_H_
+#define DRAM_SUB_FUNC_H
 
 #define DRAM_UPDATE_STATUS_ERR	(-1)
 #define DRAM_BOOT_STATUS_COLD	(0)
@@ -14,4 +14,4 @@
 int32_t rcar_dram_update_boot_status(uint32_t status);
 void rcar_dram_get_boot_status(uint32_t * status);
 
-#endif
+#endif /* DRAM_SUB_FUNC_H */

drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.h

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef PFC_INIT_E3_H__
+#ifndef PFC_INIT_E3_H
-#define PFC_INIT_E3_H__
+#define PFC_INIT_E3_H
 
 void pfc_init_e3(void);
 
-#endif /* PFC_INIT_E3_H__ */
+#endif /* PFC_INIT_E3_H */

drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.h

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef PFC_INIT_H3_V1_H__
+#ifndef PFC_INIT_H3_V1_H
-#define PFC_INIT_H3_V1_H__
+#define PFC_INIT_H3_V1_H
 
 void pfc_init_h3_v1(void);
 
-#endif /* PFC_INIT_H3_V1_H__ */
+#endif /* PFC_INIT_H3_V1_H */

drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.h

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef PFC_INIT_H3_V2_H__
+#ifndef PFC_INIT_H3_V2_H
-#define PFC_INIT_H3_V2_H__
+#define PFC_INIT_H3_V2_H
 
 void pfc_init_h3_v2(void);
 
-#endif /* PFC_INIT_H3_V2_H__ */
+#endif /* PFC_INIT_H3_V2_H */

drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.h

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef PFC_INIT_M3_H__
+#ifndef PFC_INIT_M3_H
-#define PFC_INIT_M3_H__
+#define PFC_INIT_M3_H
 
 void pfc_init_m3(void);
 
-#endif /* PFC_INIT_M3_H__ */
+#endif /* PFC_INIT_M3_H */

drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.h

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef PFC_INIT_M3N_H__
+#ifndef PFC_INIT_M3N_H
-#define PFC_INIT_M3N_H__
+#define PFC_INIT_M3N_H
 
 void pfc_init_m3n(void);
 
-#endif /* PFC_INIT_M3N_H__ */
+#endif /* PFC_INIT_M3N_H */

drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.h

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef QOS_INIT_H_E3_V10__
+#ifndef QOS_INIT_E3_V10_H
-#define QOS_INIT_H_E3_V10__
+#define QOS_INIT_E3_V10_H
 
 void qos_init_e3_v10(void);
 
-#endif /* QOS_INIT_H_E3_V10__ */
+#endif /* QOS_INIT_E3_V10_H */

drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.h

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef QOS_INIT_H_H3_V10__
+#ifndef QOS_INIT_H3_V10_H
-#define QOS_INIT_H_H3_V10__
+#define QOS_INIT_H3_V10_H
 
 void qos_init_h3_v10(void);
 
-#endif /* QOS_INIT_H_H3_V10__ */
+#endif /* QOS_INIT_H3_V10_H */

drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.h

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef QOS_INIT_H_H3_V11__
+#ifndef QOS_INIT_H3_V11_H
-#define QOS_INIT_H_H3_V11__
+#define QOS_INIT_H3_V11_H
 
 void qos_init_h3_v11(void);
 
-#endif /* QOS_INIT_H_H3_V11__ */
+#endif /* QOS_INIT_H3_V11_H */

drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.h

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef QOS_INIT_H_H3_V20__
+#ifndef QOS_INIT_H3_V20_H
-#define QOS_INIT_H_H3_V20__
+#define QOS_INIT_H3_V20_H
 
 void qos_init_h3_v20(void);
 
-#endif /* QOS_INIT_H_H3_V20__ */
+#endif /* QOS_INIT_H3_V20_H */

drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.h

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef QOS_INIT_H_H3_V30__
+#ifndef QOS_INIT_H3_V30_H
-#define QOS_INIT_H_H3_V30__
+#define QOS_INIT_H3_V30_H
 
 void qos_init_h3_v30(void);
 
-#endif /* QOS_INIT_H_H3_V20__ */
+#endif /* QOS_INIT_H3_V30_H */

drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.h

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef QOS_INIT_H_H3N_V30__
+#ifndef QOS_INIT_H3N_V30_H
-#define QOS_INIT_H_H3N_V30__
+#define QOS_INIT_H3N_V30_H
 
 void qos_init_h3n_v30(void);
 
-#endif /* QOS_INIT_H_H3N_V30__ */
+#endif /* QOS_INIT_H3N_V30_H */

drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.h

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef QOS_INIT_H_M3_V10__
+#ifndef QOS_INIT_M3_V10_H
-#define QOS_INIT_H_M3_V10__
+#define QOS_INIT_M3_V10_H
 
 void qos_init_m3_v10(void);
 
-#endif /* QOS_INIT_H_M3_V10__ */
+#endif /* QOS_INIT_M3_V10_H */

drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.h

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef QOS_INIT_H_M3_V11__
+#ifndef QOS_INIT_M3_V11_H
-#define QOS_INIT_H_M3_V11__
+#define QOS_INIT_M3_V11_H
 
 void qos_init_m3_v11(void);
 
-#endif /* QOS_INIT_H_M3_V11__ */
+#endif /* QOS_INIT_M3_V11_H */

drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.h

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef QOS_INIT_H_M3N_V10__
+#ifndef QOS_INIT_M3N_V10_H
-#define QOS_INIT_H_M3N_V10__
+#define QOS_INIT_M3N_V10_H
 
 void qos_init_m3n_v10(void);
 
-#endif /* QOS_INIT_H_M3N_V10__ */
+#endif /* QOS_INIT_M3N_V10_H */

drivers/staging/renesas/rcar/qos/qos_common.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef QOS_COMMON_H_
+#ifndef QOS_COMMON_H
-#define QOS_COMMON_H_
+#define QOS_COMMON_H
 
 #define RCAR_REF_DEFAULT		(0U)
 
@@ -110,4 +110,4 @@ typedef struct {
 extern uint32_t qos_init_ddr_ch;
 extern uint8_t qos_init_ddr_phyvalid;
 
-#endif /* QOS_COMMON_H_ */
+#endif /* QOS_COMMON_H */

drivers/staging/renesas/rcar/qos/qos_init.h

@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef QOS_INIT_H_
+#ifndef QOS_INIT_H
-#define QOS_INIT_H_
+#define QOS_INIT_H
 
 extern void rcar_qos_init(void);
 extern uint8_t get_boardcnf_phyvalid(void);
 
-#endif /* QOS_INIT_H_ */
+#endif /* QOS_INIT_H */

drivers/staging/renesas/rcar/qos/qos_reg.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef QOS_REG_H_
+#ifndef QOS_REG_H
-#define QOS_REG_H_
+#define QOS_REG_H
 
 #define	RCAR_QOS_NONE				(3U)
 #define	RCAR_QOS_TYPE_DEFAULT		(0U)
@@ -118,4 +118,4 @@
 #define	QOSWT_WTSET0				(QOS_BASE0 + 0x8038U)
 #define	QOSWT_WTSET1				(QOS_BASE0 + 0x803CU)
 
-#endif /* QOS_REG_H_ */
+#endif /* QOS_REG_H */

include/bl1/bl1.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __BL1_FWU_H__
+#ifndef BL1_H
-#define __BL1_FWU_H__
+#define BL1_H
 
 #include <bl_common.h>
 
@@ -97,4 +97,4 @@ void bl1_calc_bl2_mem_layout(const meminfo_t *bl1_mem_layout,
 			meminfo_t *bl2_mem_layout);
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BL1_FWU_H__ */
+#endif /* BL1_H */

include/bl1/tbbr/tbbr_img_desc.h

@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TBBR_IMG_DESC_H__
+#ifndef TBBR_IMG_DESC_H
-#define __TBBR_IMG_DESC_H__
+#define TBBR_IMG_DESC_H
 
 #include <bl_common.h>
 
 extern image_desc_t bl1_tbbr_image_descs[];
 
-#endif /* __TBBR_IMG_DESC_H__ */
+#endif /* TBBR_IMG_DESC_H */

include/bl2/bl2.h

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef BL2_H__
+#ifndef BL2_H
-#define BL2_H__
+#define BL2_H
 
 void bl2_main(void);
 
-#endif /* BL2_H__ */
+#endif /* BL2_H */

include/bl2u/bl2u.h

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef BL2_H__
+#ifndef BL2U_H
-#define BL2_H__
+#define BL2U_H
 
 void bl2u_main(void);
 
-#endif /* BL2_H__ */
+#endif /* BL2U_H */

include/bl31/bl31.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __BL31_H__
+#ifndef BL31_H
-#define __BL31_H__
+#define BL31_H
 
 #include <stdint.h>
 
@@ -21,4 +21,4 @@ void bl31_warm_entrypoint(void);
 void bl31_main(void);
 void bl31_lib_init(void);
 
-#endif /* __BL31_H__ */
+#endif /* BL31_H */

include/bl31/ea_handle.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __EA_HANDLE_H__
+#ifndef EA_HANDLE_H
-#define __EA_HANDLE_H__
+#define EA_HANDLE_H
 
 /* Constants indicating the reason for an External Abort */
 
@@ -21,4 +21,4 @@
 /* RAS event signalled as peripheral interrupt */
 #define ERROR_INTERRUPT		3
 
-#endif /* __EA_HANDLE_H__ */
+#endif /* EA_HANDLE_H */

include/bl31/interrupt_mgmt.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __INTERRUPT_MGMT_H__
+#ifndef INTERRUPT_MGMT_H
-#define __INTERRUPT_MGMT_H__
+#define INTERRUPT_MGMT_H
 
 #include <arch.h>
 #include <utils_def.h>
@@ -144,4 +144,4 @@ int disable_intr_rm_local(uint32_t type, uint32_t security_state);
 int enable_intr_rm_local(uint32_t type, uint32_t security_state);
 
 #endif /*__ASSEMBLY__*/
-#endif /* __INTERRUPT_MGMT_H__ */
+#endif /* INTERRUPT_MGMT_H */

include/bl32/payloads/tlk.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TLK_H__
+#ifndef TLK_H
-#define __TLK_H__
+#define TLK_H
 
 #include <utils_def.h>
 
@@ -63,4 +63,4 @@
 #define TOS_UID			0xbf00ff01 /* Implementation UID */
 #define TOS_CALL_VERSION	0xbf00ff03 /* Trusted OS Call Version */
 
-#endif /* __TLK_H__ */
+#endif /* TLK_H */

include/bl32/sp_min/platform_sp_min.h

@@ -4,8 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLATFORM_SP_MIN_H__
+#ifndef PLATFORM_SP_MIN_H
-#define __PLATFORM_SP_MIN_H__
+#define PLATFORM_SP_MIN_H
+
+#include <stdint.h>
 
 /*******************************************************************************
  * Mandatory SP_MIN functions
@@ -20,4 +22,4 @@ entry_point_info_t *sp_min_plat_get_bl33_ep_info(void);
 /* Platforms that enable SP_MIN_WITH_SECURE_FIQ shall implement this api */
 void sp_min_plat_fiq_handler(uint32_t id);
 
-#endif /* __PLATFORM_SP_MIN_H__ */
+#endif /* PLATFORM_SP_MIN_H */

include/bl32/tsp/platform_tsp.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLATFORM_TSP_H__
+#ifndef PLATFORM_TSP_H
-
+#define PLATFORM_TSP_H
 
 /*******************************************************************************
  * Mandatory TSP functions (only if platform contains a TSP)
@@ -14,7 +14,4 @@ void tsp_early_platform_setup(void);
 void tsp_plat_arch_setup(void);
 void tsp_platform_setup(void);
 
-
+#endif /* PLATFORM_TSP_H */
-#define __PLATFORM_H__
-
-#endif

include/bl32/tsp/tsp.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TSP_H__
+#ifndef TSP_H
-#define __TSP_H__
+#define TSP_H
 
 /*
  * SMC function IDs that TSP uses to signal various forms of completions
@@ -107,4 +107,4 @@ typedef struct tsp_vectors {
 
 #endif /* __ASSEMBLY__ */
 
-#endif /* __TSP_H__ */
+#endif /* TSP_H */

include/common/aarch32/asm_macros.S

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __ASM_MACROS_S__
+#ifndef ASM_MACROS_S
-#define __ASM_MACROS_S__
+#define ASM_MACROS_S
 
 #include <arch.h>
 #include <asm_macros_common.S>
@@ -189,4 +189,4 @@
 		.endif
 	.endm
 
-#endif /* __ASM_MACROS_S__ */
+#endif /* ASM_MACROS_S */

include/common/aarch32/assert_macros.S

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __ASSERT_MACROS_S__
+#ifndef ASSERT_MACROS_S
-#define __ASSERT_MACROS_S__
+#define ASSERT_MACROS_S
 
 	/*
 	 * Assembler macro to enable asm_assert. We assume that the stack is
@@ -23,4 +23,4 @@
 	b	asm_assert;\
 300:
 
-#endif /* __ASSERT_MACROS_S__ */
+#endif /* ASSERT_MACROS_S */

include/common/aarch32/console_macros.S

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __CONSOLE_MACROS_S__
+#ifndef CONSOLE_MACROS_S
-#define __CONSOLE_MACROS_S__
+#define CONSOLE_MACROS_S
 
 #include <console.h>
 
@@ -81,4 +81,4 @@
 	b	console_register
 	.endm
 #endif /* USE_FINISH_CONSOLE_REG_2 */
-#endif /* __CONSOLE_MACROS_S__ */
+#endif /* CONSOLE_MACROS_S */

include/common/aarch32/el3_common_macros.S

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __EL3_COMMON_MACROS_S__
+#ifndef EL3_COMMON_MACROS_S
-#define __EL3_COMMON_MACROS_S__
+#define EL3_COMMON_MACROS_S
 
 #include <arch.h>
 #include <asm_macros.S>
@@ -313,4 +313,4 @@
 #endif
 	.endm
 
-#endif /* __EL3_COMMON_MACROS_S__ */
+#endif /* EL3_COMMON_MACROS_S */

include/common/aarch64/asm_macros.S

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __ASM_MACROS_S__
+#ifndef ASM_MACROS_S
-#define __ASM_MACROS_S__
+#define ASM_MACROS_S
 
 #include <arch.h>
 #include <asm_macros_common.S>
@@ -192,4 +192,4 @@
 	.endm
 #endif
 
-#endif /* __ASM_MACROS_S__ */
+#endif /* ASM_MACROS_S */

include/common/aarch64/assert_macros.S

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __ASSERT_MACROS_S__
+#ifndef ASSERT_MACROS_S
-#define __ASSERT_MACROS_S__
+#define ASSERT_MACROS_S
 
 	/*
 	 * Assembler macro to enable asm_assert. Use this macro wherever
@@ -26,4 +26,4 @@
 	b	asm_assert ;\
 300:
 
-#endif /* __ASSERT_MACROS_S__ */
+#endif /* ASSERT_MACROS_S */

include/common/aarch64/console_macros.S

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __CONSOLE_MACROS_S__
+#ifndef CONSOLE_MACROS_S
-#define __CONSOLE_MACROS_S__
+#define CONSOLE_MACROS_S
 
 #include <console.h>
 
@@ -84,4 +84,5 @@
 	b	console_register
 	.endm
 #endif /* USE_FINISH_CONSOLE_REG_2 */
-#endif /* __CONSOLE_MACROS_S__ */
+
+#endif /* CONSOLE_MACROS_S */

include/common/aarch64/el3_common_macros.S

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __EL3_COMMON_MACROS_S__
+#ifndef EL3_COMMON_MACROS_S
-#define __EL3_COMMON_MACROS_S__
+#define EL3_COMMON_MACROS_S
 
 #include <arch.h>
 #include <asm_macros.S>
@@ -341,4 +341,4 @@
 #endif
 	.endm
 
-#endif /* __EL3_COMMON_MACROS_S__ */
+#endif /* EL3_COMMON_MACROS_S */

include/common/asm_macros_common.S

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __ASM_MACROS_COMMON_S__
+#ifndef ASM_MACROS_COMMON_S
-#define __ASM_MACROS_COMMON_S__
+#define ASM_MACROS_COMMON_S
 
 	/*
 	 * This macro is used to create a function label and place the
@@ -104,4 +104,4 @@
 	.endm
 
 
-#endif /* __ASM_MACROS_COMMON_S__ */
+#endif /* ASM_MACROS_COMMON_S */

include/common/bl_common.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __BL_COMMON_H__
+#ifndef BL_COMMON_H
-#define __BL_COMMON_H__
+#define BL_COMMON_H
 
 #include <ep_info.h>
 #include <param_header.h>
@@ -201,4 +201,4 @@ void setup_page_tables(const struct mmap_region *bl_regions,
 
 #endif /*__ASSEMBLY__*/
 
-#endif /* __BL_COMMON_H__ */
+#endif /* BL_COMMON_H */

include/common/desc_image_load.h

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __DESC_IMAGE_LOAD_H__
+#ifndef DESC_IMAGE_LOAD_H
-#define __DESC_IMAGE_LOAD_H__
+#define DESC_IMAGE_LOAD_H
 
 #include <bl_common.h>
 
@@ -37,4 +37,4 @@ bl_load_info_t *get_bl_load_info_from_mem_params_desc(void);
 bl_params_t *get_next_bl_params_from_mem_params_desc(void);
 void populate_next_bl_params_config(bl_params_t *bl2_to_next_bl_params);
 
-#endif /* __DESC_IMAGE_LOAD_H__ */
+#endif /* DESC_IMAGE_LOAD_H */

include/common/ep_info.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __EP_INFO_H__
+#ifndef EP_INFO_H
-#define __EP_INFO_H__
+#define EP_INFO_H
 
 #include <param_header.h>
 #include <utils_def.h>
@@ -132,5 +132,4 @@ CASSERT(sizeof(uintptr_t) ==
 
 #endif /*__ASSEMBLY__*/
 
-#endif /* __EP_INFO_H__ */
+#endif /* EP_INFO_H */
-

include/common/fdt_wrappers.h

@@ -6,8 +6,8 @@
 
 /* Helper functions to offer easier navigation of Device Tree Blob */
 
-#ifndef __FDT_WRAPPERS__
+#ifndef FDT_WRAPPERS_H
-#define __FDT_WRAPPERS__
+#define FDT_WRAPPERS_H
 
 /* Number of cells, given total length in bytes. Each cell is 4 bytes long */
 #define NCELLS(len) ((len) / 4U)
@@ -21,4 +21,4 @@ int fdtw_read_string(const void *dtb, int node, const char *prop,
 int fdtw_write_inplace_cells(void *dtb, int node, const char *prop,
 		unsigned int cells, void *value);
 
-#endif /* __FDT_WRAPPERS__ */
+#endif /* FDT_WRAPPERS_H */

include/common/image_decompress.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __IMAGE_DECOMPRESS_H__
+#ifndef IMAGE_DECOMPRESS_H
-#define __IMAGE_DECOMPRESS_H__
+#define IMAGE_DECOMPRESS_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -21,4 +21,4 @@ void image_decompress_init(uintptr_t buf_base, uint32_t buf_size,
 void image_decompress_prepare(struct image_info *info);
 int image_decompress(struct image_info *info);
 
-#endif /* __IMAGE_DECOMPRESS_H___ */
+#endif /* IMAGE_DECOMPRESS_H */

include/common/interrupt_props.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __INTERRUPT_PROPS_H__
+#ifndef INTERRUPT_PROPS_H
-#define __INTERRUPT_PROPS_H__
+#define INTERRUPT_PROPS_H
 
 #ifndef __ASSEMBLY__
 
@@ -26,4 +26,4 @@ typedef struct interrupt_prop {
 } interrupt_prop_t;
 
 #endif /* __ASSEMBLY__ */
-#endif /* __INTERRUPT_PROPS_H__ */
+#endif /* INTERRUPT_PROPS_H */

include/common/param_header.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PARAM_HEADER_H__
+#ifndef PARAM_HEADER_H
-#define __PARAM_HEADER_H__
+#define PARAM_HEADER_H
 
 #include <stdbool.h>
 #include <utils_def.h>
@@ -54,5 +54,4 @@ typedef struct param_header {
 
 #endif /*__ASSEMBLY__*/
 
-#endif /* __PARAM_HEADER_H__ */
+#endif /* PARAM_HEADER_H */
-

include/common/romlib.h

@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef ROMLIB_H_
+#ifndef ROMLIB_H
+#define ROMLIB_H
 
 #define ROMLIB_MAJOR   0
 #define ROMLIB_MINOR   1
@@ -12,4 +13,4 @@
 
 int rom_lib_init(int version);
 
-#endif
+#endif /* ROMLIB_H */

include/common/tbbr/cot_def.h

@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __COT_DEF_H__
+#ifndef COT_DEF_H
-#define __COT_DEF_H__
+#define COT_DEF_H
 
 /* TBBR CoT definitions */
 
 #define COT_MAX_VERIFIED_PARAMS		4
 
-#endif /* __COT_DEF_H__ */
+#endif /* COT_DEF_H */

include/common/tbbr/tbbr_img_def.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TBBR_IMG_DEF_H__
+#ifndef TBBR_IMG_DEF_H
-#define __TBBR_IMG_DEF_H__
+#define TBBR_IMG_DEF_H
 
 #include <utils_def.h>
 
@@ -86,4 +86,4 @@
 /* Define size of the array */
 #define MAX_NUMBER_IDS			U(30)
 
-#endif /* __TBBR_IMG_DEF_H__ */
+#endif /* TBBR_IMG_DEF_H */

include/drivers/allwinner/sunxi_rsb.h

@@ -17,4 +17,4 @@ int rsb_assign_runtime_address(uint16_t hw_addr, uint8_t rt_addr);
 int rsb_read(uint8_t rt_addr, uint8_t reg_addr);
 int rsb_write(uint8_t rt_addr, uint8_t reg_addr, uint8_t value);
 
-#endif
+#endif /* SUNXI_RSB_H */

include/drivers/arm/arm_gicv3_common.h

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#ifndef __ARM_GICV3_COMMON_H__
+#ifndef ARM_GICV3_COMMON_H
-#define __ARM_GICV3_COMMON_H__
+#define ARM_GICV3_COMMON_H
 
 /*******************************************************************************
  * GIC500/GIC600 Re-distributor interface registers & constants
@@ -17,4 +17,4 @@
 #define WAKER_SL_BIT		(1U << WAKER_SL_SHIFT)
 #define WAKER_QSC_BIT		(1U << WAKER_QSC_SHIFT)
 
-#endif /* __ARM_GICV3_COMMON_H__ */
+#endif /* ARM_GICV3_COMMON_H */

include/drivers/arm/cci.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CCI_H__
+#ifndef CCI_H
-#define __CCI_H__
+#define CCI_H
 
 #include <utils_def.h>
 
@@ -122,4 +122,4 @@ void cci_enable_snoop_dvm_reqs(unsigned int master_id);
 void cci_disable_snoop_dvm_reqs(unsigned int master_id);
 
 #endif /* __ASSEMBLY__ */
-#endif /* __CCI_H__ */
+#endif /* CCI_H */

include/drivers/arm/ccn.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __CCN_H__
+#ifndef CCN_H
-#define __CCN_H__
+#define CCN_H
 
 /*
  * This macro defines the maximum number of master interfaces that reside on
@@ -93,4 +93,4 @@ unsigned int ccn_get_l3_run_mode(void);
 int ccn_get_part0_id(uintptr_t periphbase);
 
 #endif /* __ASSEMBLY__ */
-#endif /* __CCN_H__ */
+#endif /* CCN_H */

include/drivers/arm/gic_common.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __GIC_COMMON_H__
+#ifndef GIC_COMMON_H
-#define __GIC_COMMON_H__
+#define GIC_COMMON_H
 
 #include <utils_def.h>
 
@@ -100,4 +100,4 @@
 	(GIC_HIGHEST_NS_PRIORITY << 16)	|	\
 	(GIC_HIGHEST_NS_PRIORITY << 24))
 
-#endif /* __GIC_COMMON_H__ */
+#endif /* GIC_COMMON_H */

include/drivers/arm/gicv2.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __GICV2_H__
+#ifndef GICV2_H
-#define __GICV2_H__
+#define GICV2_H
 
 #include <gic_common.h>
 
@@ -184,4 +184,4 @@ unsigned int gicv2_set_pmr(unsigned int mask);
 void gicv2_interrupt_set_cfg(unsigned int id, unsigned int cfg);
 
 #endif /* __ASSEMBLY__ */
-#endif /* __GICV2_H__ */
+#endif /* GICV2_H */

include/drivers/arm/gicv3.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __GICV3_H__
+#ifndef GICV3_H
-#define __GICV3_H__
+#define GICV3_H
 
 /*******************************************************************************
  * GICv3 miscellaneous definitions
@@ -405,4 +405,4 @@ void gicv3_clear_interrupt_pending(unsigned int id, unsigned int proc_num);
 unsigned int gicv3_set_pmr(unsigned int mask);
 
 #endif /* __ASSEMBLY__ */
-#endif /* __GICV3_H__ */
+#endif /* GICV3_H */

include/drivers/arm/nic_400.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __NIC_400_H__
+#ifndef NIC_400_H
-#define __NIC_400_H__
+#define NIC_400_H
 
 /*
  * Address of slave 'n' security setting in the NIC-400 address region
@@ -13,4 +13,4 @@
  */
 #define NIC400_ADDR_CTRL_SECURITY_REG(n)	(0x8 + (n) * 4)
 
-#endif /* __NIC_400_H__ */
+#endif /* NIC_400_H */

include/drivers/arm/pl011.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PL011_H__
+#ifndef PL011_H
-#define __PL011_H__
+#define PL011_H
 
 #include <console.h>
 
@@ -103,4 +103,4 @@ int console_pl011_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud,
 
 #endif /*__ASSEMBLY__*/
 
-#endif	/* __PL011_H__ */
+#endif /* PL011_H */

include/drivers/arm/pl061_gpio.h

@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PL061_GPIO_H__
+#ifndef PL061_GPIO_H
-#define __PL061_GPIO_H__
+#define PL061_GPIO_H
 
 #include <gpio.h>
 
 void pl061_gpio_register(uintptr_t base_addr, int gpio_dev);
 void pl061_gpio_init(void);
 
-#endif	/* __PL061_GPIO_H__ */
+#endif /* PL061_GPIO_H */

include/drivers/arm/smmu_v3.h

@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SMMU_V3_H__
+#ifndef SMMU_V3_H
-#define __SMMU_V3_H__
+#define SMMU_V3_H
 
-#include <utils_def.h>
 #include <stdint.h>
+#include <utils_def.h>
 
 /* SMMUv3 register offsets from device base */
 #define SMMU_S_IDR1	U(0x8004)
@@ -24,4 +24,4 @@
 
 int smmuv3_init(uintptr_t smmu_base);
 
-#endif /* __SMMU_V3_H__ */
+#endif /* SMMU_V3_H */

include/drivers/arm/sp804_delay_timer.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __SP804_DELAY_TIMER_H__
+#ifndef SP804_DELAY_TIMER_H
-#define __SP804_DELAY_TIMER_H__
+#define SP804_DELAY_TIMER_H
 
 #include <delay_timer.h>
 #include <stdint.h>
@@ -25,4 +25,4 @@ void sp804_timer_ops_init(uintptr_t base_addr, const timer_ops_t *ops);
 		sp804_timer_ops_init((base_addr), &sp804_timer_ops);	\
 	} while (0)
 
-#endif /* __SP804_DELAY_TIMER_H__ */
+#endif /* SP804_DELAY_TIMER_H */

include/drivers/auth/auth_common.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __AUTH_COMMON_H__
+#ifndef AUTH_COMMON_H
-#define __AUTH_COMMON_H__
+#define AUTH_COMMON_H
 
 /*
  * Authentication framework common types
@@ -117,4 +117,4 @@ typedef struct auth_method_desc_s {
 		.len = (unsigned int)_len \
 	}
 
-#endif /* __AUTH_COMMON_H__ */
+#endif /* AUTH_COMMON_H */