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/include/drivers/allwinner/sunxi_rsb.h b/include/drivers/allwinner/sunxi_rsb.h
index 5a69d35..3d003ce 100644
--- a/include/drivers/allwinner/sunxi_rsb.h
+++ b/include/drivers/allwinner/sunxi_rsb.h
@@ -17,4 +17,4 @@
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 */
diff --git a/include/drivers/arm/arm_gicv3_common.h b/include/drivers/arm/arm_gicv3_common.h
index 8970e3f..b88b59f 100644
--- a/include/drivers/arm/arm_gicv3_common.h
+++ b/include/drivers/arm/arm_gicv3_common.h
@@ -3,8 +3,8 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __ARM_GICV3_COMMON_H__
-#define __ARM_GICV3_COMMON_H__
+#ifndef 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 */
diff --git a/include/drivers/arm/cci.h b/include/drivers/arm/cci.h
index 41a3de2..24b76da 100644
--- a/include/drivers/arm/cci.h
+++ b/include/drivers/arm/cci.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __CCI_H__
-#define __CCI_H__
+#ifndef CCI_H
+#define CCI_H
#include <utils_def.h>
@@ -122,4 +122,4 @@
void cci_disable_snoop_dvm_reqs(unsigned int master_id);
#endif /* __ASSEMBLY__ */
-#endif /* __CCI_H__ */
+#endif /* CCI_H */
diff --git a/include/drivers/arm/ccn.h b/include/drivers/arm/ccn.h
index d740867..eba974d 100644
--- a/include/drivers/arm/ccn.h
+++ b/include/drivers/arm/ccn.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __CCN_H__
-#define __CCN_H__
+#ifndef CCN_H
+#define CCN_H
/*
* This macro defines the maximum number of master interfaces that reside on
@@ -93,4 +93,4 @@
int ccn_get_part0_id(uintptr_t periphbase);
#endif /* __ASSEMBLY__ */
-#endif /* __CCN_H__ */
+#endif /* CCN_H */
diff --git a/include/drivers/arm/gic_common.h b/include/drivers/arm/gic_common.h
index 0ef1148..2f5334f 100644
--- a/include/drivers/arm/gic_common.h
+++ b/include/drivers/arm/gic_common.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __GIC_COMMON_H__
-#define __GIC_COMMON_H__
+#ifndef 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 */
diff --git a/include/drivers/arm/gicv2.h b/include/drivers/arm/gicv2.h
index c80f80b..705077c 100644
--- a/include/drivers/arm/gicv2.h
+++ b/include/drivers/arm/gicv2.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __GICV2_H__
-#define __GICV2_H__
+#ifndef GICV2_H
+#define GICV2_H
#include <gic_common.h>
@@ -184,4 +184,4 @@
void gicv2_interrupt_set_cfg(unsigned int id, unsigned int cfg);
#endif /* __ASSEMBLY__ */
-#endif /* __GICV2_H__ */
+#endif /* GICV2_H */
diff --git a/include/drivers/arm/gicv3.h b/include/drivers/arm/gicv3.h
index 9c291eb..c26f297 100644
--- a/include/drivers/arm/gicv3.h
+++ b/include/drivers/arm/gicv3.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __GICV3_H__
-#define __GICV3_H__
+#ifndef GICV3_H
+#define GICV3_H
/*******************************************************************************
* GICv3 miscellaneous definitions
@@ -405,4 +405,4 @@
unsigned int gicv3_set_pmr(unsigned int mask);
#endif /* __ASSEMBLY__ */
-#endif /* __GICV3_H__ */
+#endif /* GICV3_H */
diff --git a/include/drivers/arm/nic_400.h b/include/drivers/arm/nic_400.h
index 740f184..bb74982 100644
--- a/include/drivers/arm/nic_400.h
+++ b/include/drivers/arm/nic_400.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __NIC_400_H__
-#define __NIC_400_H__
+#ifndef 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 */
diff --git a/include/drivers/arm/pl011.h b/include/drivers/arm/pl011.h
index 137764d..6216a61 100644
--- a/include/drivers/arm/pl011.h
+++ b/include/drivers/arm/pl011.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __PL011_H__
-#define __PL011_H__
+#ifndef PL011_H
+#define PL011_H
#include <console.h>
@@ -103,4 +103,4 @@
#endif /*__ASSEMBLY__*/
-#endif /* __PL011_H__ */
+#endif /* PL011_H */
diff --git a/include/drivers/arm/pl061_gpio.h b/include/drivers/arm/pl061_gpio.h
index 971a23d..6c4a9f5 100644
--- a/include/drivers/arm/pl061_gpio.h
+++ b/include/drivers/arm/pl061_gpio.h
@@ -4,12 +4,12 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __PL061_GPIO_H__
-#define __PL061_GPIO_H__
+#ifndef 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 */
diff --git a/include/drivers/arm/smmu_v3.h b/include/drivers/arm/smmu_v3.h
index e3912e3..1b7ffb8 100644
--- a/include/drivers/arm/smmu_v3.h
+++ b/include/drivers/arm/smmu_v3.h
@@ -4,11 +4,11 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __SMMU_V3_H__
-#define __SMMU_V3_H__
+#ifndef 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 */
diff --git a/include/drivers/arm/sp804_delay_timer.h b/include/drivers/arm/sp804_delay_timer.h
index 0cf168b..8eb8715 100644
--- a/include/drivers/arm/sp804_delay_timer.h
+++ b/include/drivers/arm/sp804_delay_timer.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __SP804_DELAY_TIMER_H__
-#define __SP804_DELAY_TIMER_H__
+#ifndef SP804_DELAY_TIMER_H
+#define SP804_DELAY_TIMER_H
#include <delay_timer.h>
#include <stdint.h>
@@ -25,4 +25,4 @@
sp804_timer_ops_init((base_addr), &sp804_timer_ops); \
} while (0)
-#endif /* __SP804_DELAY_TIMER_H__ */
+#endif /* SP804_DELAY_TIMER_H */
diff --git a/include/drivers/auth/auth_common.h b/include/drivers/auth/auth_common.h
index 058375f..e6859fd 100644
--- a/include/drivers/auth/auth_common.h
+++ b/include/drivers/auth/auth_common.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __AUTH_COMMON_H__
-#define __AUTH_COMMON_H__
+#ifndef AUTH_COMMON_H
+#define AUTH_COMMON_H
/*
* Authentication framework common types
@@ -117,4 +117,4 @@
.len = (unsigned int)_len \
}
-#endif /* __AUTH_COMMON_H__ */
+#endif /* AUTH_COMMON_H */
diff --git a/include/drivers/auth/auth_mod.h b/include/drivers/auth/auth_mod.h
index bb3b8f9..19bc2f1 100644
--- a/include/drivers/auth/auth_mod.h
+++ b/include/drivers/auth/auth_mod.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __AUTH_MOD_H__
-#define __AUTH_MOD_H__
+#ifndef AUTH_MOD_H
+#define AUTH_MOD_H
#if TRUSTED_BOARD_BOOT
@@ -49,4 +49,4 @@
#endif /* TRUSTED_BOARD_BOOT */
-#endif /* __AUTH_MOD_H__ */
+#endif /* AUTH_MOD_H */
diff --git a/include/drivers/auth/crypto_mod.h b/include/drivers/auth/crypto_mod.h
index f9b44d1..3a42105 100644
--- a/include/drivers/auth/crypto_mod.h
+++ b/include/drivers/auth/crypto_mod.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __CRYPTO_MOD_H__
-#define __CRYPTO_MOD_H__
+#ifndef CRYPTO_MOD_H
+#define CRYPTO_MOD_H
/* Return values */
enum crypto_ret_value {
@@ -59,4 +59,4 @@
extern const crypto_lib_desc_t crypto_lib_desc;
-#endif /* __CRYPTO_MOD_H__ */
+#endif /* CRYPTO_MOD_H */
diff --git a/include/drivers/auth/img_parser_mod.h b/include/drivers/auth/img_parser_mod.h
index eaf3e6e..4379693 100644
--- a/include/drivers/auth/img_parser_mod.h
+++ b/include/drivers/auth/img_parser_mod.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __IMG_PARSER_MOD_H__
-#define __IMG_PARSER_MOD_H__
+#ifndef IMG_PARSER_MOD_H
+#define IMG_PARSER_MOD_H
#include <auth_common.h>
@@ -61,4 +61,4 @@
.get_auth_param = _get_param \
}
-#endif /* __IMG_PARSER_MOD_H__ */
+#endif /* IMG_PARSER_MOD_H */
diff --git a/include/drivers/auth/mbedtls/mbedtls_common.h b/include/drivers/auth/mbedtls/mbedtls_common.h
index 5d3e198..a9c2352 100644
--- a/include/drivers/auth/mbedtls/mbedtls_common.h
+++ b/include/drivers/auth/mbedtls/mbedtls_common.h
@@ -4,9 +4,9 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __MBEDTLS_COMMON_H__
-#define __MBEDTLS_COMMON_H__
+#ifndef MBEDTLS_COMMON_H
+#define MBEDTLS_COMMON_H
void mbedtls_init(void);
-#endif /* __MBEDTLS_COMMON_H__ */
+#endif /* MBEDTLS_COMMON_H */
diff --git a/include/drivers/auth/mbedtls/mbedtls_config.h b/include/drivers/auth/mbedtls/mbedtls_config.h
index cc57b77..d143d73 100644
--- a/include/drivers/auth/mbedtls/mbedtls_config.h
+++ b/include/drivers/auth/mbedtls/mbedtls_config.h
@@ -3,8 +3,8 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __MBEDTLS_CONFIG_H__
-#define __MBEDTLS_CONFIG_H__
+#ifndef MBEDTLS_CONFIG_H
+#define MBEDTLS_CONFIG_H
/*
* Key algorithms currently supported on mbed TLS libraries
@@ -104,4 +104,4 @@
#define TF_MBEDTLS_HEAP_SIZE U(7168)
#endif
-#endif /* __MBEDTLS_CONFIG_H__ */
+#endif /* MBEDTLS_CONFIG_H */
diff --git a/include/drivers/cadence/cdns_uart.h b/include/drivers/cadence/cdns_uart.h
index 51de8e3..f92d9fb 100644
--- a/include/drivers/cadence/cdns_uart.h
+++ b/include/drivers/cadence/cdns_uart.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __CADENCE_UART_H__
-#define __CADENCE_UART_H__
+#ifndef CDNS_UART_H
+#define CDNS_UART_H
#include <console.h>
@@ -47,4 +47,4 @@
#endif /*__ASSEMBLY__*/
-#endif
+#endif /* CDNS_UART_H */
diff --git a/include/drivers/cfi/v2m_flash.h b/include/drivers/cfi/v2m_flash.h
index 5763b36..6beec50 100644
--- a/include/drivers/cfi/v2m_flash.h
+++ b/include/drivers/cfi/v2m_flash.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __NORFLASH_H_
-#define __NORFLASH_H_
+#ifndef V2M_FLASH_H
+#define V2M_FLASH_H
#include <stdint.h>
@@ -42,5 +42,4 @@
int nor_unlock(uintptr_t base_addr);
int nor_erase(uintptr_t base_addr);
-#endif /* __NORFLASH_H_ */
-
+#endif /* V2M_FLASH_H*/
diff --git a/include/drivers/console.h b/include/drivers/console.h
index 1f041b9..2375466 100644
--- a/include/drivers/console.h
+++ b/include/drivers/console.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __CONSOLE_H__
-#define __CONSOLE_H__
+#ifndef CONSOLE_H
+#define CONSOLE_H
#include <utils_def.h>
@@ -80,5 +80,4 @@
#endif /* __ASSEMBLY__ */
-#endif /* __CONSOLE_H__ */
-
+#endif /* CONSOLE_H */
diff --git a/include/drivers/console_assertions.h b/include/drivers/console_assertions.h
index cedce86..559bb50 100644
--- a/include/drivers/console_assertions.h
+++ b/include/drivers/console_assertions.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __CONSOLE_ASSERTIONS_H__
-#define __CONSOLE_ASSERTIONS_H__
+#ifndef CONSOLE_ASSERTIONS_H
+#define CONSOLE_ASSERTIONS_H
#include <cassert.h>
@@ -26,5 +26,4 @@
CASSERT(CONSOLE_T_DRVDATA == sizeof(console_t),
assert_console_t_drvdata_offset_mismatch);
-#endif /* __CONSOLE_ASSERTIONS_H__ */
-
+#endif /* CONSOLE_ASSERTIONS_H */
diff --git a/include/drivers/coreboot/cbmem_console.h b/include/drivers/coreboot/cbmem_console.h
index 4fca36f..7fe7a72 100644
--- a/include/drivers/coreboot/cbmem_console.h
+++ b/include/drivers/coreboot/cbmem_console.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __CBMEM_CONSOLE_H__
-#define __CBMEM_CONSOLE_H__
+#ifndef CBMEM_CONSOLE_H
+#define CBMEM_CONSOLE_H
#include <console.h>
@@ -24,4 +24,4 @@
#endif /* __ASSEMBLER__ */
-#endif /* __CBMEM_CONSOLE_H__ */
+#endif /* CBMEM_CONSOLE_H */
diff --git a/include/drivers/delay_timer.h b/include/drivers/delay_timer.h
index b28f619..684f1c3 100644
--- a/include/drivers/delay_timer.h
+++ b/include/drivers/delay_timer.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __DELAY_TIMER_H__
-#define __DELAY_TIMER_H__
+#ifndef DELAY_TIMER_H
+#define DELAY_TIMER_H
#include <stdint.h>
@@ -27,5 +27,4 @@
void udelay(uint32_t usec);
void timer_init(const timer_ops_t *ops_ptr);
-
-#endif /* __DELAY_TIMER_H__ */
+#endif /* DELAY_TIMER_H */
diff --git a/include/drivers/dw_ufs.h b/include/drivers/dw_ufs.h
index a9774cf..13e53f1 100644
--- a/include/drivers/dw_ufs.h
+++ b/include/drivers/dw_ufs.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __DW_UFS_H__
-#define __DW_UFS_H__
+#ifndef DW_UFS_H
+#define DW_UFS_H
#include <stdint.h>
@@ -107,4 +107,4 @@
int dw_ufs_init(dw_ufs_params_t *params);
-#endif /* __DW_UFS_H__ */
+#endif /* DW_UFS_H */
diff --git a/include/drivers/generic_delay_timer.h b/include/drivers/generic_delay_timer.h
index 1c53a72..adba10f 100644
--- a/include/drivers/generic_delay_timer.h
+++ b/include/drivers/generic_delay_timer.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __GENERIC_DELAY_TIMER_H__
-#define __GENERIC_DELAY_TIMER_H__
+#ifndef GENERIC_DELAY_TIMER_H
+#define GENERIC_DELAY_TIMER_H
#include <stdint.h>
@@ -13,4 +13,4 @@
void generic_delay_timer_init(void);
-#endif /* __GENERIC_DELAY_TIMER_H__ */
+#endif /* GENERIC_DELAY_TIMER_H */
diff --git a/include/drivers/gpio.h b/include/drivers/gpio.h
index 5722051..bef62f7 100644
--- a/include/drivers/gpio.h
+++ b/include/drivers/gpio.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __GPIO_H__
-#define __GPIO_H__
+#ifndef GPIO_H
+#define GPIO_H
#define GPIO_DIR_OUT 0
#define GPIO_DIR_IN 1
@@ -34,4 +34,4 @@
int gpio_get_pull(int gpio);
void gpio_init(const gpio_ops_t *ops);
-#endif /* __GPIO_H__ */
+#endif /* GPIO_H */
diff --git a/include/drivers/io/io_block.h b/include/drivers/io/io_block.h
index 4f3ab39..d6d32f9 100644
--- a/include/drivers/io/io_block.h
+++ b/include/drivers/io/io_block.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __IO_BLOCK_H__
-#define __IO_BLOCK_H__
+#ifndef IO_BLOCK_H
+#define IO_BLOCK_H
#include <io_storage.h>
@@ -25,4 +25,4 @@
int register_io_dev_block(const struct io_dev_connector **dev_con);
-#endif /* __IO_BLOCK_H__ */
+#endif /* IO_BLOCK_H */
diff --git a/include/drivers/io/io_driver.h b/include/drivers/io/io_driver.h
index 8306407..587f137 100644
--- a/include/drivers/io/io_driver.h
+++ b/include/drivers/io/io_driver.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __IO_DRIVER_H__
-#define __IO_DRIVER_H__
+#ifndef IO_DRIVER_H
+#define IO_DRIVER_H
#include <io_storage.h>
#include <stdint.h>
@@ -56,4 +56,4 @@
/* Register an IO device */
int io_register_device(const io_dev_info_t *dev_info);
-#endif /* __IO_DRIVER_H__ */
+#endif /* IO_DRIVER_H */
diff --git a/include/drivers/io/io_dummy.h b/include/drivers/io/io_dummy.h
index abe77ec..edfc699 100644
--- a/include/drivers/io/io_dummy.h
+++ b/include/drivers/io/io_dummy.h
@@ -4,9 +4,9 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __IO_DUMMY_H__
-#define __IO_DUMMY_H__
+#ifndef IO_DUMMY_H
+#define IO_DUMMY_H
int register_io_dev_dummy(const struct io_dev_connector **dev_con);
-#endif /* __IO_DUMMY_H__ */
+#endif /* IO_DUMMY_H */
diff --git a/include/drivers/io/io_fip.h b/include/drivers/io/io_fip.h
index 1131cc7..e0b5746 100644
--- a/include/drivers/io/io_fip.h
+++ b/include/drivers/io/io_fip.h
@@ -4,11 +4,11 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __IO_FIP_H__
-#define __IO_FIP_H__
+#ifndef IO_FIP_H
+#define IO_FIP_H
struct io_dev_connector;
int register_io_dev_fip(const struct io_dev_connector **dev_con);
-#endif /* __IO_FIP_H__ */
+#endif /* IO_FIP_H */
diff --git a/include/drivers/io/io_memmap.h b/include/drivers/io/io_memmap.h
index 70e4e55..87e3466 100644
--- a/include/drivers/io/io_memmap.h
+++ b/include/drivers/io/io_memmap.h
@@ -4,11 +4,11 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __IO_MEMMAP_H__
-#define __IO_MEMMAP_H__
+#ifndef IO_MEMMAP_H
+#define IO_MEMMAP_H
struct io_dev_connector;
int register_io_dev_memmap(const struct io_dev_connector **dev_con);
-#endif /* __IO_MEMMAP_H__ */
+#endif /* IO_MEMMAP_H */
diff --git a/include/drivers/io/io_semihosting.h b/include/drivers/io/io_semihosting.h
index a917f5a..e90ea5c 100644
--- a/include/drivers/io/io_semihosting.h
+++ b/include/drivers/io/io_semihosting.h
@@ -4,11 +4,11 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __IO_SH_H__
-#define __IO_SH_H__
+#ifndef IO_SEMIHOSTING_H
+#define IO_SEMIHOSTING_H
struct io_dev_connector;
int register_io_dev_sh(const struct io_dev_connector **dev_con);
-#endif /* __IO_SH_H__ */
+#endif /* IO_SEMIHOSTING_H */
diff --git a/include/drivers/io/io_storage.h b/include/drivers/io/io_storage.h
index 02308e3..c496d48 100644
--- a/include/drivers/io/io_storage.h
+++ b/include/drivers/io/io_storage.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __IO_H__
-#define __IO_H__
+#ifndef IO_STORAGE_H
+#define IO_STORAGE_H
#include <errno.h>
#include <stdint.h>
@@ -101,4 +101,4 @@
int io_close(uintptr_t handle);
-#endif /* __IO_H__ */
+#endif /* IO_STORAGE_H */
diff --git a/include/drivers/marvell/addr_map.h b/include/drivers/marvell/addr_map.h
index 6b957a1..0d219f2 100644
--- a/include/drivers/marvell/addr_map.h
+++ b/include/drivers/marvell/addr_map.h
@@ -7,8 +7,8 @@
/* Address map types for Marvell address translation unit drivers */
-#ifndef _ADDR_MAP_H_
-#define _ADDR_MAP_H_
+#ifndef ADDR_MAP_H
+#define ADDR_MAP_H
#include <stdint.h>
@@ -18,4 +18,4 @@
uint32_t target_id;
};
-#endif /* _ADDR_MAP_H_ */
+#endif /* ADDR_MAP_H */
diff --git a/include/drivers/marvell/amb_adec.h b/include/drivers/marvell/amb_adec.h
index 087864a..a92db5b 100644
--- a/include/drivers/marvell/amb_adec.h
+++ b/include/drivers/marvell/amb_adec.h
@@ -7,8 +7,8 @@
/* AXI to M-Bridge decoding unit driver for Marvell Armada 8K and 8K+ SoCs */
-#ifndef _AMB_ADEC_H_
-#define _AMB_ADEC_H_
+#ifndef AMB_ADEC_H
+#define AMB_ADEC_H
#include <stdint.h>
@@ -33,4 +33,4 @@
int init_amb_adec(uintptr_t base);
-#endif /* _AMB_ADEC_H_ */
+#endif /* AMB_ADEC_H */
diff --git a/include/drivers/marvell/aro.h b/include/drivers/marvell/aro.h
index 37e211f..c16f625 100644
--- a/include/drivers/marvell/aro.h
+++ b/include/drivers/marvell/aro.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
* https://spdx.org/licenses
*/
-#ifndef _ARO_H_
-#define _ARO_H_
+#ifndef ARO_H
+#define ARO_H
enum hws_freq {
CPU_FREQ_2000,
@@ -44,4 +44,4 @@
int init_aro(void);
-#endif /* _ARO_H_ */
+#endif /* ARO_H */
diff --git a/include/drivers/marvell/cache_llc.h b/include/drivers/marvell/cache_llc.h
index 9e41793..1aa4c88 100644
--- a/include/drivers/marvell/cache_llc.h
+++ b/include/drivers/marvell/cache_llc.h
@@ -9,8 +9,8 @@
* for Marvell SoCs in AP806, AP807, and AP810
*/
-#ifndef _CACHE_LLC_H_
-#define _CACHE_LLC_H_
+#ifndef CACHE_LLC_H
+#define CACHE_LLC_H
#define LLC_CTRL(ap) (MVEBU_LLC_BASE(ap) + 0x100)
#define LLC_SYNC(ap) (MVEBU_LLC_BASE(ap) + 0x700)
@@ -38,5 +38,4 @@
void llc_runtime_enable(int ap_index);
#endif
-#endif /* _CACHE_LLC_H_ */
-
+#endif /* CACHE_LLC_H */
diff --git a/include/drivers/marvell/ccu.h b/include/drivers/marvell/ccu.h
index ff30a76..2757765 100644
--- a/include/drivers/marvell/ccu.h
+++ b/include/drivers/marvell/ccu.h
@@ -7,8 +7,8 @@
/* CCU unit device driver for Marvell AP807, AP807 and AP810 SoCs */
-#ifndef _CCU_H_
-#define _CCU_H_
+#ifndef CCU_H
+#define CCU_H
#ifndef __ASSEMBLY__
#include <addr_map.h>
@@ -48,4 +48,4 @@
void ccu_restore_win_all(int ap_id);
#endif
-#endif /* _CCU_H_ */
+#endif /* CCU_H */
diff --git a/include/drivers/marvell/gwin.h b/include/drivers/marvell/gwin.h
index 5dc9f24..6b7f175 100644
--- a/include/drivers/marvell/gwin.h
+++ b/include/drivers/marvell/gwin.h
@@ -7,8 +7,8 @@
/* GWIN unit device driver for Marvell AP810 SoC */
-#ifndef _GWIN_H_
-#define _GWIN_H_
+#ifndef GWIN_H
+#define GWIN_H
#include <addr_map.h>
@@ -16,4 +16,4 @@
void gwin_temp_win_insert(int ap_index, struct addr_map_win *win, int size);
void gwin_temp_win_remove(int ap_index, struct addr_map_win *win, int size);
-#endif /* _GWIN_H_ */
+#endif /* GWIN_H */
diff --git a/include/drivers/marvell/i2c.h b/include/drivers/marvell/i2c.h
index bd14385..06c5114 100644
--- a/include/drivers/marvell/i2c.h
+++ b/include/drivers/marvell/i2c.h
@@ -5,8 +5,8 @@
* https://spdx.org/licenses
*/
-#ifndef _I2C_H_
-#define _I2C_H_
+#ifndef I2C_H
+#define I2C_H
void i2c_init(void);
@@ -16,4 +16,5 @@
int i2c_write(uint8_t chip,
unsigned int addr, int alen, uint8_t *buffer, int len);
-#endif
+
+#endif /* I2C_H */
diff --git a/include/drivers/marvell/io_win.h b/include/drivers/marvell/io_win.h
index 4102a11..45e8666 100644
--- a/include/drivers/marvell/io_win.h
+++ b/include/drivers/marvell/io_win.h
@@ -7,8 +7,8 @@
/* IO Window unit device driver for Marvell AP807, AP807 and AP810 SoCs */
-#ifndef _IO_WIN_H_
-#define _IO_WIN_H_
+#ifndef IO_WIN_H
+#define IO_WIN_H
#include <addr_map.h>
@@ -18,4 +18,4 @@
void iow_save_win_all(int ap_id);
void iow_restore_win_all(int ap_id);
-#endif /* _IO_WIN_H_ */
+#endif /* IO_WIN_H */
diff --git a/include/drivers/marvell/iob.h b/include/drivers/marvell/iob.h
index 9848c0a..ccbdf96 100644
--- a/include/drivers/marvell/iob.h
+++ b/include/drivers/marvell/iob.h
@@ -7,8 +7,8 @@
/* IOW unit device driver for Marvell CP110 and CP115 SoCs */
-#ifndef _IOB_H_
-#define _IOB_H_
+#ifndef IOB_H
+#define IOB_H
#include <addr_map.h>
@@ -28,4 +28,4 @@
void iob_cfg_space_update(int ap_idx, int cp_idx,
uintptr_t base, uintptr_t new_base);
-#endif /* _IOB_H_ */
+#endif /* IOB_H */
diff --git a/include/drivers/marvell/mci.h b/include/drivers/marvell/mci.h
index 789b3b9..8ef0234 100644
--- a/include/drivers/marvell/mci.h
+++ b/include/drivers/marvell/mci.h
@@ -7,12 +7,12 @@
/* MCI bus driver for Marvell ARMADA 8K and 8K+ SoCs */
-#ifndef _MCI_H_
-#define _MCI_H_
+#ifndef MCI_H
+#define MCI_H
int mci_initialize(int mci_index);
void mci_turn_link_down(void);
void mci_turn_link_on(void);
int mci_get_link_status(void);
-#endif /* _MCI_H_ */
+#endif /* MCI_H */
diff --git a/include/drivers/marvell/mochi/ap_setup.h b/include/drivers/marvell/mochi/ap_setup.h
index 41f2bac..eff4473 100644
--- a/include/drivers/marvell/mochi/ap_setup.h
+++ b/include/drivers/marvell/mochi/ap_setup.h
@@ -7,11 +7,11 @@
/* AP8xx Marvell SoC driver */
-#ifndef __AP_SETUP_H__
-#define __AP_SETUP_H__
+#ifndef AP_SETUP_H
+#define AP_SETUP_H
void ap_init(void);
void ap_ble_init(void);
int ap_get_count(void);
-#endif /* __AP_SETUP_H__ */
+#endif /* AP_SETUP_H */
diff --git a/include/drivers/marvell/mochi/cp110_setup.h b/include/drivers/marvell/mochi/cp110_setup.h
index 839efe1..18d9f18 100644
--- a/include/drivers/marvell/mochi/cp110_setup.h
+++ b/include/drivers/marvell/mochi/cp110_setup.h
@@ -7,8 +7,8 @@
/* CP110 Marvell SoC driver */
-#ifndef __CP110_SETUP_H__
-#define __CP110_SETUP_H__
+#ifndef CP110_SETUP_H
+#define CP110_SETUP_H
#include <mmio.h>
#include <mvebu_def.h>
@@ -51,4 +51,4 @@
void cp110_init(uintptr_t cp110_base, uint32_t stream_id);
void cp110_ble_init(uintptr_t cp110_base);
-#endif /* __CP110_SETUP_H__ */
+#endif /* CP110_SETUP_H */
diff --git a/include/drivers/marvell/thermal.h b/include/drivers/marvell/thermal.h
index 191f97b..48376a7 100644
--- a/include/drivers/marvell/thermal.h
+++ b/include/drivers/marvell/thermal.h
@@ -7,8 +7,8 @@
/* Driver for thermal unit located in Marvell ARMADA 8K and compatible SoCs */
-#ifndef _THERMAL_H
-#define _THERMAL_H
+#ifndef THERMAL_H
+#define THERMAL_H
struct tsen_config {
/* thermal temperature parameters */
@@ -28,4 +28,4 @@
int marvell_thermal_read(struct tsen_config *tsen_cfg, int *temp);
struct tsen_config *marvell_thermal_config_get(void);
-#endif /* _THERMAL_H */
+#endif /* THERMAL_H */
diff --git a/include/drivers/mentor/mi2cv.h b/include/drivers/mentor/mi2cv.h
index 6b03ed7..85b733b 100644
--- a/include/drivers/mentor/mi2cv.h
+++ b/include/drivers/mentor/mi2cv.h
@@ -8,8 +8,8 @@
/* This driver provides support for Mentor Graphics MI2CV IP core */
-#ifndef _MI2CV_H_
-#define _MI2CV_H_
+#ifndef MI2CV_H
+#define MI2CV_H
#include <stdint.h>
@@ -36,4 +36,5 @@
int i2c_write(uint8_t chip,
unsigned int addr, int alen, uint8_t *buffer, int len);
-#endif
+
+#endif /* MI2CV_H */
diff --git a/include/drivers/mmc.h b/include/drivers/mmc.h
index 9900630..a62928b 100644
--- a/include/drivers/mmc.h
+++ b/include/drivers/mmc.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __MMC_H__
-#define __MMC_H__
+#ifndef MMC_H
+#define MMC_H
#include <stdint.h>
#include <utils_def.h>
@@ -232,4 +232,4 @@
unsigned int width, unsigned int flags,
struct mmc_device_info *device_info);
-#endif /* __MMC_H__ */
+#endif /* MMC_H */
diff --git a/include/drivers/partition/gpt.h b/include/drivers/partition/gpt.h
index 7a22d9e2..7984e4d 100644
--- a/include/drivers/partition/gpt.h
+++ b/include/drivers/partition/gpt.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __GPT_H__
-#define __GPT_H__
+#ifndef GPT_H
+#define GPT_H
#include <partition.h>
@@ -48,4 +48,4 @@
int parse_gpt_entry(gpt_entry_t *gpt_entry, partition_entry_t *entry);
-#endif /* __GPT_H__ */
+#endif /* GPT_H */
diff --git a/include/drivers/partition/mbr.h b/include/drivers/partition/mbr.h
index 1cacb78..1452c02 100644
--- a/include/drivers/partition/mbr.h
+++ b/include/drivers/partition/mbr.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __MBR_H__
-#define __MBR_H__
+#ifndef MBR_H
+#define MBR_H
#define MBR_OFFSET 0
@@ -26,4 +26,4 @@
unsigned int sector_nums;
} mbr_entry_t;
-#endif /* __MBR_H__ */
+#endif /* MBR_H */
diff --git a/include/drivers/partition/partition.h b/include/drivers/partition/partition.h
index 047c7dd..2aeaace 100644
--- a/include/drivers/partition/partition.h
+++ b/include/drivers/partition/partition.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __PARTITION_H__
-#define __PARTITION_H__
+#ifndef PARTITION_H
+#define PARTITION_H
#include <cassert.h>
#include <stdint.h>
@@ -36,4 +36,4 @@
const partition_entry_list_t *get_partition_entry_list(void);
void partition_init(unsigned int image_id);
-#endif /* __PARTITION_H__ */
+#endif /* PARTITION_H */
diff --git a/include/drivers/st/stm32_gpio.h b/include/drivers/st/stm32_gpio.h
index 7a5ccd3..938922b 100644
--- a/include/drivers/st/stm32_gpio.h
+++ b/include/drivers/st/stm32_gpio.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __PLAT_GPIO_H__
-#define __PLAT_GPIO_H__
+#ifndef STM32_GPIO_H
+#define STM32_GPIO_H
#include <utils_def.h>
@@ -98,4 +98,4 @@
uint32_t pull, uint32_t alternate);
#endif /*__ASSEMBLY__*/
-#endif /*__PLAT_GPIO_H__*/
+#endif /* STM32_GPIO_H */
diff --git a/include/drivers/st/stm32_i2c.h b/include/drivers/st/stm32_i2c.h
index 29b9d34..4760c00 100644
--- a/include/drivers/st/stm32_i2c.h
+++ b/include/drivers/st/stm32_i2c.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __STM32MP1_I2C_H
-#define __STM32MP1_I2C_H
+#ifndef STM32_I2C_H
+#define STM32_I2C_H
#include <stdint.h>
#include <utils_def.h>
@@ -297,4 +297,4 @@
int stm32_i2c_config_analog_filter(struct i2c_handle_s *hi2c,
uint32_t analog_filter);
-#endif /* __STM32MP1_I2C_H */
+#endif /* STM32_I2C_H */
diff --git a/include/drivers/st/stm32mp1_clk.h b/include/drivers/st/stm32mp1_clk.h
index 85a1eb8..c895517 100644
--- a/include/drivers/st/stm32mp1_clk.h
+++ b/include/drivers/st/stm32mp1_clk.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __STM32MP1_CLK_H__
-#define __STM32MP1_CLK_H__
+#ifndef STM32MP1_CLK_H
+#define STM32MP1_CLK_H
#include <arch_helpers.h>
#include <stdbool.h>
@@ -27,4 +27,4 @@
return base - (uint32_t)(~read_cntpct_el0());
}
-#endif /* __STM32MP1_CLK_H__ */
+#endif /* STM32MP1_CLK_H */
diff --git a/include/drivers/st/stm32mp1_clkfunc.h b/include/drivers/st/stm32mp1_clkfunc.h
index 635a9cd..b11ccf8 100644
--- a/include/drivers/st/stm32mp1_clkfunc.h
+++ b/include/drivers/st/stm32mp1_clkfunc.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __STM32MP1_CLKFUNC_H__
-#define __STM32MP1_CLKFUNC_H__
+#ifndef STM32MP1_CLKFUNC_H
+#define STM32MP1_CLKFUNC_H
#include <stdbool.h>
@@ -39,4 +39,4 @@
uintptr_t fdt_get_stgen_base(void);
int fdt_get_clock_id(int node);
-#endif /* __STM32MP1_CLKFUNC_H__ */
+#endif /* STM32MP1_CLKFUNC_H */
diff --git a/include/drivers/st/stm32mp1_ddr.h b/include/drivers/st/stm32mp1_ddr.h
index 0765664..363e302 100644
--- a/include/drivers/st/stm32mp1_ddr.h
+++ b/include/drivers/st/stm32mp1_ddr.h
@@ -4,10 +4,11 @@
* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
*/
-#ifndef _STM32MP1_DDR_H
-#define _STM32MP1_DDR_H
+#ifndef STM32MP1_DDR_H
+#define STM32MP1_DDR_H
#include <stdbool.h>
+#include <stdint.h>
#define DT_DDR_COMPAT "st,stm32mp1-ddr"
@@ -170,4 +171,4 @@
int stm32mp1_ddr_clk_enable(struct ddr_info *priv, uint16_t mem_speed);
void stm32mp1_ddr_init(struct ddr_info *priv,
struct stm32mp1_ddr_config *config);
-#endif /* _STM32MP1_DDR_H */
+#endif /* STM32MP1_DDR_H */
diff --git a/include/drivers/st/stm32mp1_ddr_helpers.h b/include/drivers/st/stm32mp1_ddr_helpers.h
index 298a080..38f2415 100644
--- a/include/drivers/st/stm32mp1_ddr_helpers.h
+++ b/include/drivers/st/stm32mp1_ddr_helpers.h
@@ -4,9 +4,9 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __STM32MP1_DDR_HELPERS_H__
-#define __STM32MP1_DDR_HELPERS_H__
+#ifndef STM32MP1_DDR_HELPERS_H
+#define STM32MP1_DDR_HELPERS_H
void ddr_enable_clock(void);
-#endif /* __STM32MP1_DDR_HELPERS_H__ */
+#endif /* STM32MP1_DDR_HELPERS_H */
diff --git a/include/drivers/st/stm32mp1_ddr_regs.h b/include/drivers/st/stm32mp1_ddr_regs.h
index 64ad965..9598d9b 100644
--- a/include/drivers/st/stm32mp1_ddr_regs.h
+++ b/include/drivers/st/stm32mp1_ddr_regs.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
*/
-#ifndef _RAM_STM32MP1_DDR_REGS_H
-#define _RAM_STM32MP1_DDR_REGS_H
+#ifndef STM32MP1_DDR_REGS_H
+#define STM32MP1_DDR_REGS_H
#include <utils_def.h>
@@ -410,4 +410,4 @@
void ddr_enable_clock(void);
-#endif /* _RAM_STM32MP1_DDR_REGS_H */
+#endif /* STM32MP1_DDR_REGS_H */
diff --git a/include/drivers/st/stm32mp1_pmic.h b/include/drivers/st/stm32mp1_pmic.h
index 5d94b40..cc80b25 100644
--- a/include/drivers/st/stm32mp1_pmic.h
+++ b/include/drivers/st/stm32mp1_pmic.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __STM32MP1_PMIC_H__
-#define __STM32MP1_PMIC_H__
+#ifndef STM32MP1_PMIC_H
+#define STM32MP1_PMIC_H
#include <stdbool.h>
@@ -15,4 +15,4 @@
void initialize_pmic(void);
int pmic_ddr_power_init(enum ddr_type ddr_type);
-#endif /* __STM32MP1_PMIC_H__ */
+#endif /* STM32MP1_PMIC_H */
diff --git a/include/drivers/st/stm32mp1_pwr.h b/include/drivers/st/stm32mp1_pwr.h
index e567042..b34536e 100644
--- a/include/drivers/st/stm32mp1_pwr.h
+++ b/include/drivers/st/stm32mp1_pwr.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __STM32MP1_PWR_H__
-#define __STM32MP1_PWR_H__
+#ifndef STM32MP1_PWR_H
+#define STM32MP1_PWR_H
#include <utils_def.h>
@@ -29,4 +29,4 @@
#define PWR_MPUCR_CSTDBYDIS BIT(3)
#define PWR_MPUCR_CSSF BIT(9)
-#endif /* __STM32MP1_PWR_H__ */
+#endif /* STM32MP1_PWR_H */
diff --git a/include/drivers/st/stm32mp1_ram.h b/include/drivers/st/stm32mp1_ram.h
index af96177..38360e7 100644
--- a/include/drivers/st/stm32mp1_ram.h
+++ b/include/drivers/st/stm32mp1_ram.h
@@ -4,9 +4,9 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef _STM32MP1_RAM_H
-#define _STM32MP1_RAM_H
+#ifndef STM32MP1_RAM_H
+#define STM32MP1_RAM_H
int stm32mp1_ddr_probe(void);
-#endif /* _STM32MP1_RAM_H */
+#endif /* STM32MP1_RAM_H */
diff --git a/include/drivers/st/stm32mp1_rcc.h b/include/drivers/st/stm32mp1_rcc.h
index e28ca97..87f4d7f 100644
--- a/include/drivers/st/stm32mp1_rcc.h
+++ b/include/drivers/st/stm32mp1_rcc.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __STM32MP1_RCC_H__
-#define __STM32MP1_RCC_H__
+#ifndef STM32MP1_RCC_H
+#define STM32MP1_RCC_H
#include <utils_def.h>
@@ -365,4 +365,4 @@
/* Values of RCC_MP_AHB4ENSETR register */
#define RCC_MP_AHB4ENSETR_GPIOGEN BIT(6)
-#endif /* __STM32MP1_RCC_H__ */
+#endif /* STM32MP1_RCC_H */
diff --git a/include/drivers/st/stm32mp1_reset.h b/include/drivers/st/stm32mp1_reset.h
index 76ee09d..cd488cc 100644
--- a/include/drivers/st/stm32mp1_reset.h
+++ b/include/drivers/st/stm32mp1_reset.h
@@ -4,12 +4,12 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __STM32MP1_RESET_H__
-#define __STM32MP1_RESET_H__
+#ifndef STM32MP1_RESET_H
+#define STM32MP1_RESET_H
#include <stdint.h>
void stm32mp1_reset_assert(uint32_t reset_id);
void stm32mp1_reset_deassert(uint32_t reset_id);
-#endif /* __STM32MP1_RESET_H__ */
+#endif /* STM32MP1_RESET_H */
diff --git a/include/drivers/st/stpmu1.h b/include/drivers/st/stpmu1.h
index 1b93ab2..4bbcebb 100644
--- a/include/drivers/st/stpmu1.h
+++ b/include/drivers/st/stpmu1.h
@@ -4,9 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-
-#ifndef __STPMU1_H__
-#define __STPMU1_H__
+#ifndef STPMU1_H
+#define STPMU1_H
#include <stm32_i2c.h>
#include <utils_def.h>
@@ -138,4 +137,4 @@
int stpmu1_regulator_voltage_set(const char *name, uint16_t millivolts);
void stpmu1_bind_i2c(struct i2c_handle_s *i2c_handle, uint16_t i2c_addr);
-#endif /* __STPMU1_H__ */
+#endif /* STPMU1_H */
diff --git a/include/drivers/synopsys/dw_mmc.h b/include/drivers/synopsys/dw_mmc.h
index 1ec8d1d..533a876 100644
--- a/include/drivers/synopsys/dw_mmc.h
+++ b/include/drivers/synopsys/dw_mmc.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __DW_MMC_H__
-#define __DW_MMC_H__
+#ifndef DW_MMC_H
+#define DW_MMC_H
#include <mmc.h>
@@ -20,4 +20,4 @@
void dw_mmc_init(dw_mmc_params_t *params, struct mmc_device_info *info);
-#endif /* __DW_MMC_H__ */
+#endif /* DW_MMC_H */
diff --git a/include/drivers/ti/uart/uart_16550.h b/include/drivers/ti/uart/uart_16550.h
index 9ee2a33..ad80c57 100644
--- a/include/drivers/ti/uart/uart_16550.h
+++ b/include/drivers/ti/uart/uart_16550.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __UART_16550_H__
-#define __UART_16550_H__
+#ifndef UART_16550_H
+#define UART_16550_H
#include <console.h>
@@ -93,4 +93,4 @@
#endif /*__ASSEMBLY__*/
-#endif /* __UART_16550_H__ */
+#endif /* UART_16550_H */
diff --git a/include/drivers/ufs.h b/include/drivers/ufs.h
index 88dedc5..414649b 100644
--- a/include/drivers/ufs.h
+++ b/include/drivers/ufs.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __UFS_H__
-#define __UFS_H__
+#ifndef UFS_H
+#define UFS_H
#include <utils_def.h>
@@ -545,4 +545,4 @@
size_t ufs_write_blocks(int lun, int lba, const uintptr_t buf, size_t size);
int ufs_init(const ufs_ops_t *ops, ufs_params_t *params);
-#endif /* __UFS_H__ */
+#endif /* UFS_H */