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

Standardise header guards across codebase

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 @@ extern unsigned int auth_img_flags[MAX_NUMBER_IDS];
 
 #endif /* TRUSTED_BOARD_BOOT */
 
-#endif /* __AUTH_MOD_H__ */
+#endif /* AUTH_MOD_H */

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 @@ int crypto_mod_verify_hash(void *data_ptr, unsigned int data_len,
 
 extern const crypto_lib_desc_t crypto_lib_desc;
 
-#endif /* __CRYPTO_MOD_H__ */
+#endif /* CRYPTO_MOD_H */

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 @@ int img_parser_get_auth_param(img_type_t img_type,
 		.get_auth_param = _get_param \
 	}
 
-#endif /* __IMG_PARSER_MOD_H__ */
+#endif /* IMG_PARSER_MOD_H */

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 */

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 */

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 @@ int console_cdns_register(uint64_t baseaddr, uint32_t clock, uint32_t baud,
 
 #endif /*__ASSEMBLY__*/
 
-#endif
+#endif /* CDNS_UART_H */

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_lock(uintptr_t base_addr);
 int nor_unlock(uintptr_t base_addr);
 int nor_erase(uintptr_t base_addr);
 
-#endif /* __NORFLASH_H_ */
-
+#endif /* V2M_FLASH_H*/

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 @@ void console_uninit(void);
 
 #endif /* __ASSEMBLY__ */
 
-#endif /* __CONSOLE_H__ */
-
+#endif /* CONSOLE_H */

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_FLUSH == __builtin_offsetof(console_t, flush),
 CASSERT(CONSOLE_T_DRVDATA == sizeof(console_t),
 	assert_console_t_drvdata_offset_mismatch);
 
-#endif /* __CONSOLE_ASSERTIONS_H__ */
-
+#endif /* CONSOLE_ASSERTIONS_H */

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 @@ int console_cbmc_register(uintptr_t base, console_cbmc_t *console);
 
 #endif /* __ASSEMBLER__ */
 
-#endif /* __CBMEM_CONSOLE_H__ */
+#endif /* CBMEM_CONSOLE_H */

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 mdelay(uint32_t msec);
 void udelay(uint32_t usec);
 void timer_init(const timer_ops_t *ops_ptr);
 
-
-#endif /* __DELAY_TIMER_H__ */
+#endif /* DELAY_TIMER_H */

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 @@ typedef struct dw_ufs_params {
 
 int dw_ufs_init(dw_ufs_params_t *params);
 
-#endif /* __DW_UFS_H__ */
+#endif /* DW_UFS_H */

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_args(uint32_t mult, uint32_t div);
 
 void generic_delay_timer_init(void);
 
-#endif /* __GENERIC_DELAY_TIMER_H__ */
+#endif /* GENERIC_DELAY_TIMER_H */

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 @@ void gpio_set_pull(int gpio, int pull);
 int gpio_get_pull(int gpio);
 void gpio_init(const gpio_ops_t *ops);
 
-#endif	/* __GPIO_H__ */
+#endif /* GPIO_H */

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 @@ struct io_dev_connector;
 
 int register_io_dev_block(const struct io_dev_connector **dev_con);
 
-#endif /* __IO_BLOCK_H__ */
+#endif /* IO_BLOCK_H */

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 @@ typedef struct io_dev_funcs {
 /* Register an IO device */
 int io_register_device(const io_dev_info_t *dev_info);
 
-#endif  /* __IO_DRIVER_H__ */
+#endif /* IO_DRIVER_H */

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 */

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 */

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 */

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 */