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>
diff --git a/drivers/renesas/rcar/avs/avs_driver.h b/drivers/renesas/rcar/avs/avs_driver.h
index e868928..aa773b6 100644
--- a/drivers/renesas/rcar/avs/avs_driver.h
+++ b/drivers/renesas/rcar/avs/avs_driver.h
@@ -5,8 +5,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef AVS_DRIVER_H__
-#define AVS_DRIVER_H__
+#ifndef AVS_DRIVER_H
+#define AVS_DRIVER_H
/* AVS Setting. 1:enable / 0:disable */
#ifndef AVS_SETTING_ENABLE
@@ -17,4 +17,4 @@
void rcar_avs_setting(void);
void rcar_avs_end(void);
-#endif /* AVS_DRIVER_H__ */
+#endif /* AVS_DRIVER_H */
diff --git a/drivers/renesas/rcar/board/board.h b/drivers/renesas/rcar/board/board.h
index 15d80b9..7bb2a06 100644
--- a/drivers/renesas/rcar/board/board.h
+++ b/drivers/renesas/rcar/board/board.h
@@ -5,8 +5,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
#define BOARD_SALVATOR_X (0x00)
#define BOARD_KRIEK (0x01)
@@ -32,4 +32,4 @@
int32_t rcar_get_board_type(uint32_t *type, uint32_t *rev);
-#endif
+#endif /* BOARD_H */
diff --git a/drivers/renesas/rcar/console/rcar_printf.h b/drivers/renesas/rcar/console/rcar_printf.h
index dd7a61b..bcb00c3 100644
--- a/drivers/renesas/rcar/console/rcar_printf.h
+++ b/drivers/renesas/rcar/console/rcar_printf.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef RCAR_PRINTF_H__
-#define RCAR_PRINTF_H__
+#ifndef RCAR_PRINTF_H
+#define RCAR_PRINTF_H
#include <string.h>
@@ -16,4 +16,4 @@
extern uint64_t rcar_stack_generic_timer[5];
#endif
-#endif
+#endif /* RCAR_PRINTF_H */
diff --git a/drivers/renesas/rcar/delay/micro_delay.h b/drivers/renesas/rcar/delay/micro_delay.h
index f598394..458959f 100644
--- a/drivers/renesas/rcar/delay/micro_delay.h
+++ b/drivers/renesas/rcar/delay/micro_delay.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef MICRO_DELAY_H__
-#define MICRO_DELAY_H__
+#ifndef MICRO_DELAY_H
+#define MICRO_DELAY_H
#define TMU3_MEASUREMENT (0)
@@ -23,4 +23,4 @@
#endif
-#endif
+#endif /* MICRO_DELAY_H */
diff --git a/drivers/renesas/rcar/emmc/emmc_config.h b/drivers/renesas/rcar/emmc/emmc_config.h
index 16dcea1..686ccb9 100644
--- a/drivers/renesas/rcar/emmc/emmc_config.h
+++ b/drivers/renesas/rcar/emmc/emmc_config.h
@@ -10,8 +10,8 @@
*
*/
-#ifndef __EMMC_CONFIG_H__
-#define __EMMC_CONFIG_H__
+#ifndef 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 ************************************ */
diff --git a/drivers/renesas/rcar/emmc/emmc_def.h b/drivers/renesas/rcar/emmc/emmc_def.h
index 2944515..178c795 100644
--- a/drivers/renesas/rcar/emmc/emmc_def.h
+++ b/drivers/renesas/rcar/emmc/emmc_def.h
@@ -10,8 +10,8 @@
*
*/
-#ifndef __EMMC_DEF_H__
-#define __EMMC_DEF_H__
+#ifndef EMMC_DEF_H
+#define EMMC_DEF_H
#include "emmc_std.h"
@@ -74,5 +74,5 @@
/* ********************************* CODE ********************************** */
-#endif /* #define __EMMC_DEF_H__ */
+#endif /* EMMC_DEF_H */
/* ******************************** END ************************************ */
diff --git a/drivers/renesas/rcar/emmc/emmc_hal.h b/drivers/renesas/rcar/emmc/emmc_hal.h
index 633446c..f0b7e9d 100644
--- a/drivers/renesas/rcar/emmc/emmc_hal.h
+++ b/drivers/renesas/rcar/emmc/emmc_hal.h
@@ -10,8 +10,8 @@
*
*/
-#ifndef __EMMC_HAL_H__
-#define __EMMC_HAL_H__
+#ifndef EMMC_HAL_H
+#define EMMC_HAL_H
/* ************************ HEADER (INCLUDE) SECTION *********************** */
#include <stdint.h>
/* ***************** MACROS, CONSTANTS, COMPILATION FLAGS ****************** */
@@ -313,6 +313,6 @@
/* ********************************* CODE ********************************** */
-#endif /* __EMMC_HAL_H__ */
+#endif /* EMMC_HAL_H */
/* ******************************** END ************************************ */
diff --git a/drivers/renesas/rcar/emmc/emmc_registers.h b/drivers/renesas/rcar/emmc/emmc_registers.h
index a670ab7..55ff33d 100644
--- a/drivers/renesas/rcar/emmc/emmc_registers.h
+++ b/drivers/renesas/rcar/emmc/emmc_registers.h
@@ -10,8 +10,8 @@
*
*/
-#ifndef __EMMC_REGISTERS_H__
-#define __EMMC_REGISTERS_H__
+#ifndef EMMC_REGISTERS_H
+#define EMMC_REGISTERS_H
/* ************************ HEADER (INCLUDE) SECTION *********************** */
@@ -256,5 +256,5 @@
/* ********************************* CODE ********************************** */
-#endif /* __EMMC_REGISTERS_H__ */
+#endif /* EMMC_REGISTERS_H */
/* ******************************** END ************************************ */
diff --git a/drivers/renesas/rcar/emmc/emmc_std.h b/drivers/renesas/rcar/emmc/emmc_std.h
index f4ce198..99cb6b9 100644
--- a/drivers/renesas/rcar/emmc/emmc_std.h
+++ b/drivers/renesas/rcar/emmc/emmc_std.h
@@ -10,8 +10,8 @@
*
*/
-#ifndef __EMMC_STD_H__
-#define __EMMC_STD_H__
+#ifndef EMMC_STD_H
+#define EMMC_STD_H
#include "emmc_hal.h"
@@ -471,4 +471,4 @@
/* ********************************* CODE ********************************** */
/* ******************************** END ************************************ */
-#endif /* __EMMC_STD_H__ */
+#endif /* EMMC_STD_H */
diff --git a/drivers/renesas/rcar/iic_dvfs/iic_dvfs.h b/drivers/renesas/rcar/iic_dvfs/iic_dvfs.h
index 3c4a9a5..2dec58f 100644
--- a/drivers/renesas/rcar/iic_dvfs/iic_dvfs.h
+++ b/drivers/renesas/rcar/iic_dvfs/iic_dvfs.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef IIC_DVFS_H__
-#define IIC_DVFS_H__
+#ifndef 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 */
diff --git a/drivers/renesas/rcar/io/io_common.h b/drivers/renesas/rcar/io/io_common.h
index c5729b8..6eb7777 100644
--- a/drivers/renesas/rcar/io/io_common.h
+++ b/drivers/renesas/rcar/io/io_common.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef IO_COMMON_H__
-#define IO_COMMON_H__
+#ifndef IO_COMMON_H
+#define IO_COMMON_H
typedef struct io_drv_spec {
size_t offset;
@@ -13,4 +13,4 @@
uint32_t partition;
} io_drv_spec_t;
-#endif
+#endif /* IO_COMMON_H */
diff --git a/drivers/renesas/rcar/io/io_emmcdrv.h b/drivers/renesas/rcar/io/io_emmcdrv.h
index 82c6c51..95070f2 100644
--- a/drivers/renesas/rcar/io/io_emmcdrv.h
+++ b/drivers/renesas/rcar/io/io_emmcdrv.h
@@ -4,10 +4,10 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef IO_EMMCDRV_H__
-#define IO_EMMCDRV_H__
+#ifndef 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 */
diff --git a/drivers/renesas/rcar/io/io_memdrv.h b/drivers/renesas/rcar/io/io_memdrv.h
index 41727d3..90e6812 100644
--- a/drivers/renesas/rcar/io/io_memdrv.h
+++ b/drivers/renesas/rcar/io/io_memdrv.h
@@ -4,10 +4,10 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef IO_MEMDRV_H__
-#define IO_MEMDRV_H__
+#ifndef 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 */
diff --git a/drivers/renesas/rcar/io/io_private.h b/drivers/renesas/rcar/io/io_private.h
index d0e66c0..207523a 100644
--- a/drivers/renesas/rcar/io/io_private.h
+++ b/drivers/renesas/rcar/io/io_private.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef IO_PRIVATE_H_
-#define IO_PRIVATE_H_
+#ifndef 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 */
diff --git a/drivers/renesas/rcar/io/io_rcar.h b/drivers/renesas/rcar/io/io_rcar.h
index 2420902..c26a617 100644
--- a/drivers/renesas/rcar/io/io_rcar.h
+++ b/drivers/renesas/rcar/io/io_rcar.h
@@ -4,11 +4,11 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef IO_RCAR_H__
-#define IO_RCAR_H__
+#ifndef 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 */
diff --git a/drivers/renesas/rcar/pwrc/pwrc.h b/drivers/renesas/rcar/pwrc/pwrc.h
index 166886e..3cdac69 100644
--- a/drivers/renesas/rcar/pwrc/pwrc.h
+++ b/drivers/renesas/rcar/pwrc/pwrc.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef RCAR_PWRC_H__
-#define RCAR_PWRC_H__
+#ifndef PWRC_H
+#define PWRC_H
#define PPOFFR_OFF 0x0
#define PPONR_OFF 0x4
@@ -74,4 +74,4 @@
#endif
-#endif
+#endif /* PWRC_H */
diff --git a/drivers/renesas/rcar/rom/rom_api.h b/drivers/renesas/rcar/rom/rom_api.h
index 85105ef..1d5b03d 100644
--- a/drivers/renesas/rcar/rom/rom_api.h
+++ b/drivers/renesas/rcar/rom/rom_api.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef ROM_API_H__
-#define ROM_API_H__
+#ifndef ROM_API_H
+#define ROM_API_H
#include <stdint.h>
@@ -28,4 +28,4 @@
rom_read_flash_f f);
uint32_t rcar_rom_get_lcs(uint32_t *lcs);
-#endif
+#endif /* ROM_API_H */
diff --git a/drivers/renesas/rcar/rpc/rpc_registers.h b/drivers/renesas/rcar/rpc/rpc_registers.h
index 326519d..79aea85 100644
--- a/drivers/renesas/rcar/rpc/rpc_registers.h
+++ b/drivers/renesas/rcar/rpc/rpc_registers.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef RPC_REGISTER_H__
-#define RPC_REGISTER_H__
+#ifndef RPC_REGISTERS_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 */