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/plat/xilinx/zynqmp/include/plat_macros.S b/plat/xilinx/zynqmp/include/plat_macros.S
index 41bc174..e54cfc4 100644
--- a/plat/xilinx/zynqmp/include/plat_macros.S
+++ b/plat/xilinx/zynqmp/include/plat_macros.S
@@ -3,8 +3,8 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __PLAT_MACROS_S__
-#define __PLAT_MACROS_S__
+#ifndef PLAT_MACROS_S
+#define PLAT_MACROS_S
#include <arm_macros.S>
#include <cci_macros.S>
@@ -25,4 +25,4 @@
print_cci_regs
.endm
-#endif /* __PLAT_MACROS_S__ */
+#endif /* PLAT_MACROS_S */
diff --git a/plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.h b/plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.h
index 387ffd2..197c788 100644
--- a/plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.h
+++ b/plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.h
@@ -6,8 +6,8 @@
/* ZynqMP IPI mailbox doorbell service enums and defines */
-#ifndef _IPI_MAILBOX_SVC_H_
-#define _IPI_MAILBOX_SVC_H_
+#ifndef IPI_MAILBOX_SVC_H
+#define IPI_MAILBOX_SVC_H
#include <stdint.h>
@@ -36,4 +36,4 @@
uint64_t x3, uint64_t x4, void *cookie, void *handle,
uint64_t flags);
-#endif /* _IPI_MAILBOX_SVC_H_ */
+#endif /* IPI_MAILBOX_SVC_H */
diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_clock.h b/plat/xilinx/zynqmp/pm_service/pm_api_clock.h
index 386f275..f7cbdba 100644
--- a/plat/xilinx/zynqmp/pm_service/pm_api_clock.h
+++ b/plat/xilinx/zynqmp/pm_service/pm_api_clock.h
@@ -8,8 +8,8 @@
* ZynqMP system level PM-API functions for clock control.
*/
-#ifndef _PM_API_CLOCK_H_
-#define _PM_API_CLOCK_H_
+#ifndef PM_API_CLOCK_H
+#define PM_API_CLOCK_H
#include <utils_def.h>
#include "pm_common.h"
@@ -313,4 +313,4 @@
enum pm_ret_status pm_api_clk_get_pll_frac_data(unsigned int pll,
unsigned int *data);
-#endif /* _PM_API_CLOCK_H_ */
+#endif /* PM_API_CLOCK_H */
diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.h b/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.h
index d68c5e3..337f732 100644
--- a/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.h
+++ b/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.h
@@ -8,8 +8,8 @@
* ZynqMP system level PM-API functions for pin control.
*/
-#ifndef _PM_API_IOCTL_H_
-#define _PM_API_IOCTL_H_
+#ifndef PM_API_IOCTL_H
+#define PM_API_IOCTL_H
#include "pm_common.h"
@@ -80,4 +80,4 @@
unsigned int arg1,
unsigned int arg2,
unsigned int *value);
-#endif /* _PM_API_IOCTL_H_ */
+#endif /* PM_API_IOCTL_H */
diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.h b/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.h
index c70a774..9923c00 100644
--- a/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.h
+++ b/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.h
@@ -8,8 +8,8 @@
* ZynqMP system level PM-API functions for pin control.
*/
-#ifndef _PM_API_PINCTRL_H_
-#define _PM_API_PINCTRL_H_
+#ifndef PM_API_PINCTRL_H
+#define PM_API_PINCTRL_H
#include "pm_common.h"
@@ -731,4 +731,4 @@
enum pm_ret_status pm_api_pinctrl_get_num_functions(unsigned int *nfuncs);
enum pm_ret_status pm_api_pinctrl_get_num_func_groups(unsigned int fid,
unsigned int *ngroups);
-#endif /* _PM_API_PINCTRL_H_ */
+#endif /* PM_API_PINCTRL_H */
diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_sys.h b/plat/xilinx/zynqmp/pm_service/pm_api_sys.h
index 1c9255e..fee91cd 100644
--- a/plat/xilinx/zynqmp/pm_service/pm_api_sys.h
+++ b/plat/xilinx/zynqmp/pm_service/pm_api_sys.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef _PM_API_SYS_H_
-#define _PM_API_SYS_H_
+#ifndef PM_API_SYS_H
+#define PM_API_SYS_H
#include <stdint.h>
#include "pm_defs.h"
@@ -176,4 +176,4 @@
uint32_t address_low,
uint32_t *value);
-#endif /* _PM_API_SYS_H_ */
+#endif /* PM_API_SYS_H */
diff --git a/plat/xilinx/zynqmp/pm_service/pm_client.h b/plat/xilinx/zynqmp/pm_service/pm_client.h
index 070db89..0a34a07 100644
--- a/plat/xilinx/zynqmp/pm_service/pm_client.h
+++ b/plat/xilinx/zynqmp/pm_service/pm_client.h
@@ -9,8 +9,8 @@
* the execution environment.
*/
-#ifndef _PM_CLIENT_H_
-#define _PM_CLIENT_H_
+#ifndef PM_CLIENT_H
+#define PM_CLIENT_H
#include "pm_common.h"
#include "pm_defs.h"
@@ -25,4 +25,4 @@
/* Global variables to be set in pm_client.c */
extern const struct pm_proc *primary_proc;
-#endif /* _PM_CLIENT_H_ */
+#endif /* PM_CLIENT_H */
diff --git a/plat/xilinx/zynqmp/pm_service/pm_common.h b/plat/xilinx/zynqmp/pm_service/pm_common.h
index 4d03bc0..5474627 100644
--- a/plat/xilinx/zynqmp/pm_service/pm_common.h
+++ b/plat/xilinx/zynqmp/pm_service/pm_common.h
@@ -9,8 +9,8 @@
* for PU Power Management. This file should be common for all PU's.
*/
-#ifndef _PM_COMMON_H_
-#define _PM_COMMON_H_
+#ifndef PM_COMMON_H
+#define PM_COMMON_H
#include <debug.h>
#include <stdint.h>
@@ -52,4 +52,4 @@
const struct pm_proc *pm_get_proc(unsigned int cpuid);
const struct pm_proc *pm_get_proc_by_node(enum pm_node_id nid);
-#endif /* _PM_COMMON_H_ */
+#endif /* PM_COMMON_H */
diff --git a/plat/xilinx/zynqmp/pm_service/pm_defs.h b/plat/xilinx/zynqmp/pm_service/pm_defs.h
index 1fbf6ee..7a0d978 100644
--- a/plat/xilinx/zynqmp/pm_service/pm_defs.h
+++ b/plat/xilinx/zynqmp/pm_service/pm_defs.h
@@ -6,8 +6,8 @@
/* ZynqMP power management enums and defines */
-#ifndef _PM_DEFS_H_
-#define _PM_DEFS_H_
+#ifndef PM_DEFS_H
+#define PM_DEFS_H
/*********************************************************************
* Macro definitions
@@ -265,4 +265,4 @@
PMF_SHUTDOWN_SUBTYPE_SYSTEM,
};
-#endif /* _PM_DEFS_H_ */
+#endif /* PM_DEFS_H */
diff --git a/plat/xilinx/zynqmp/pm_service/pm_ipi.h b/plat/xilinx/zynqmp/pm_service/pm_ipi.h
index 439dcf4..650de52 100644
--- a/plat/xilinx/zynqmp/pm_service/pm_ipi.h
+++ b/plat/xilinx/zynqmp/pm_service/pm_ipi.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef _PM_IPI_H_
-#define _PM_IPI_H_
+#ifndef PM_IPI_H
+#define PM_IPI_H
#include "pm_common.h"
@@ -22,4 +22,4 @@
void pm_ipi_irq_enable(const struct pm_proc *proc);
void pm_ipi_irq_clear(const struct pm_proc *proc);
-#endif /* _PM_IPI_H_ */
+#endif /* PM_IPI_H */
diff --git a/plat/xilinx/zynqmp/pm_service/pm_svc_main.h b/plat/xilinx/zynqmp/pm_service/pm_svc_main.h
index d895321..0968f64 100644
--- a/plat/xilinx/zynqmp/pm_service/pm_svc_main.h
+++ b/plat/xilinx/zynqmp/pm_service/pm_svc_main.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef _PM_SVC_MAIN_H_
-#define _PM_SVC_MAIN_H_
+#ifndef PM_SVC_MAIN_H
+#define PM_SVC_MAIN_H
#include "pm_common.h"
@@ -14,4 +14,4 @@
uint64_t x4, void *cookie, void *handle,
uint64_t flags);
-#endif /* _PM_SVC_MAIN_H_ */
+#endif /* PM_SVC_MAIN_H */
diff --git a/plat/xilinx/zynqmp/zynqmp_def.h b/plat/xilinx/zynqmp/zynqmp_def.h
index 9d19b1b..ba382dd 100644
--- a/plat/xilinx/zynqmp/zynqmp_def.h
+++ b/plat/xilinx/zynqmp/zynqmp_def.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __ZYNQMP_DEF_H__
-#define __ZYNQMP_DEF_H__
+#ifndef ZYNQMP_DEF_H
+#define ZYNQMP_DEF_H
#include <common_def.h>
@@ -340,4 +340,4 @@
#define AFIFM6_WRCTRL U(13)
#define FABRIC_WIDTH U(3)
-#endif /* __ZYNQMP_DEF_H__ */
+#endif /* ZYNQMP_DEF_H */
diff --git a/plat/xilinx/zynqmp/zynqmp_ipi.h b/plat/xilinx/zynqmp/zynqmp_ipi.h
index 0544ddb..b9b40dd 100644
--- a/plat/xilinx/zynqmp/zynqmp_ipi.h
+++ b/plat/xilinx/zynqmp/zynqmp_ipi.h
@@ -6,8 +6,8 @@
/* ZynqMP IPI management enums and defines */
-#ifndef _ZYNQMP_IPI_H_
-#define _ZYNQMP_IPI_H_
+#ifndef ZYNQMP_IPI_H
+#define ZYNQMP_IPI_H
#include <stdint.h>
@@ -67,4 +67,4 @@
/* Enable IPI mailbox notification interrupt */
void ipi_mb_enable_irq(uint32_t local, uint32_t remote);
-#endif /* _ZYNQMP_IPI_H_ */
+#endif /* ZYNQMP_IPI_H */
diff --git a/plat/xilinx/zynqmp/zynqmp_private.h b/plat/xilinx/zynqmp/zynqmp_private.h
index d5024c3..8a8d38a 100644
--- a/plat/xilinx/zynqmp/zynqmp_private.h
+++ b/plat/xilinx/zynqmp/zynqmp_private.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __ZYNQMP_PRIVATE_H__
-#define __ZYNQMP_PRIVATE_H__
+#ifndef ZYNQMP_PRIVATE_H
+#define ZYNQMP_PRIVATE_H
#include <bl_common.h>
#include <interrupt_mgmt.h>
@@ -38,4 +38,4 @@
enum fsbl_handoff fsbl_atf_handover(entry_point_info_t *bl32_image_ep_info,
entry_point_info_t *bl33_image_ep_info);
-#endif /* __ZYNQMP_PRIVATE_H__ */
+#endif /* ZYNQMP_PRIVATE_H */