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/staging/renesas/rcar/ddr/boot_init_dram.h b/drivers/staging/renesas/rcar/ddr/boot_init_dram.h
index 7ec2930..4b0a9eb 100644
--- a/drivers/staging/renesas/rcar/ddr/boot_init_dram.h
+++ b/drivers/staging/renesas/rcar/ddr/boot_init_dram.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __BOOT_INIT_DRAM_
-#define __BOOT_INIT_DRAM_
+#ifndef BOOT_INIT_DRAM_H
+#define BOOT_INIT_DRAM_H
extern int32_t rcar_dram_init(void);
@@ -15,4 +15,4 @@
#define INITDRAM_ERR_O (0xfffffffe)
#define INITDRAM_ERR_T (0xfffffff0)
-#endif
+#endif /* BOOT_INIT_DRAM_H */
diff --git a/drivers/staging/renesas/rcar/ddr/ddr_a/boot_init_dram_regdef_e3.h b/drivers/staging/renesas/rcar/ddr/ddr_a/boot_init_dram_regdef_e3.h
index 80e3eec..8606f76 100644
--- a/drivers/staging/renesas/rcar/ddr/ddr_a/boot_init_dram_regdef_e3.h
+++ b/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_
-#define BOOT_INIT_DRAM_REGDEF_E3_H_
+#ifndef 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 @@
#ifdef __cplusplus
}
-#endif /* __cplusplus */
-#endif /* BOOT_INIT_DRAM_REGDEF_E3_H_ */
+#endif /* __cplusplus */
+
+#endif /* BOOT_INIT_DRAM_REGDEF_E3_H */
diff --git a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.h b/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.h
index 115765b..47fe07b 100644
--- a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.h
+++ b/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.h
@@ -4,11 +4,10 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#pragma once
-#include <stdint.h>
+#ifndef DDR_INIT_E3_H
+#define DDR_INIT_E3_H
-#ifndef __DDR_INIT_E3_
-#define __DDR_INIT_E3_
+#include <stdint.h>
#define RCAR_E3_DDR_VERSION "rev.0.09"
@@ -31,4 +30,4 @@
#define INITDRAM_ERR_O (0xfffffffe)
#define INITDRAM_ERR_T (0xfffffff0)
-#endif /* __DDR_INIT_E3_ */
+#endif /* DDR_INIT_E3_H */
diff --git a/drivers/staging/renesas/rcar/ddr/dram_sub_func.h b/drivers/staging/renesas/rcar/ddr/dram_sub_func.h
index e083bfb..7e88f42 100644
--- a/drivers/staging/renesas/rcar/ddr/dram_sub_func.h
+++ b/drivers/staging/renesas/rcar/ddr/dram_sub_func.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef DRAM_SUB_FUNC_H_
-#define DRAM_SUB_FUNC_H_
+#ifndef 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 */
diff --git a/drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.h b/drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.h
index 041a778..647a937 100644
--- a/drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.h
+++ b/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__
-#define PFC_INIT_E3_H__
+#ifndef PFC_INIT_E3_H
+#define PFC_INIT_E3_H
void pfc_init_e3(void);
-#endif /* PFC_INIT_E3_H__ */
+#endif /* PFC_INIT_E3_H */
diff --git a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.h b/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.h
index 844c1b9..2478e1c 100644
--- a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.h
+++ b/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__
-#define PFC_INIT_H3_V1_H__
+#ifndef 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 */
diff --git a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.h b/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.h
index 3f691f8..b02f93e 100644
--- a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.h
+++ b/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__
-#define PFC_INIT_H3_V2_H__
+#ifndef 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 */
diff --git a/drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.h b/drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.h
index c6ee693..70885de 100644
--- a/drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.h
+++ b/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__
-#define PFC_INIT_M3_H__
+#ifndef PFC_INIT_M3_H
+#define PFC_INIT_M3_H
void pfc_init_m3(void);
-#endif /* PFC_INIT_M3_H__ */
+#endif /* PFC_INIT_M3_H */
diff --git a/drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.h b/drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.h
index 9e08e58..3e6f879 100644
--- a/drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.h
+++ b/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__
-#define PFC_INIT_M3N_H__
+#ifndef PFC_INIT_M3N_H
+#define PFC_INIT_M3N_H
void pfc_init_m3n(void);
-#endif /* PFC_INIT_M3N_H__ */
+#endif /* PFC_INIT_M3N_H */
diff --git a/drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.h b/drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.h
index ab82e96..2c1d8c5 100644
--- a/drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.h
+++ b/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__
-#define QOS_INIT_H_E3_V10__
+#ifndef QOS_INIT_E3_V10_H
+#define QOS_INIT_E3_V10_H
void qos_init_e3_v10(void);
-#endif /* QOS_INIT_H_E3_V10__ */
+#endif /* QOS_INIT_E3_V10_H */
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.h b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.h
index e55f774..f96182a 100644
--- a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.h
+++ b/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__
-#define QOS_INIT_H_H3_V10__
+#ifndef QOS_INIT_H3_V10_H
+#define QOS_INIT_H3_V10_H
void qos_init_h3_v10(void);
-#endif /* QOS_INIT_H_H3_V10__ */
+#endif /* QOS_INIT_H3_V10_H */
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.h b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.h
index 759e58b..3faeb4f 100644
--- a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.h
+++ b/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__
-#define QOS_INIT_H_H3_V11__
+#ifndef QOS_INIT_H3_V11_H
+#define QOS_INIT_H3_V11_H
void qos_init_h3_v11(void);
-#endif /* QOS_INIT_H_H3_V11__ */
+#endif /* QOS_INIT_H3_V11_H */
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.h b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.h
index 59c1bdb..9b7619e 100644
--- a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.h
+++ b/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__
-#define QOS_INIT_H_H3_V20__
+#ifndef QOS_INIT_H3_V20_H
+#define QOS_INIT_H3_V20_H
void qos_init_h3_v20(void);
-#endif /* QOS_INIT_H_H3_V20__ */
+#endif /* QOS_INIT_H3_V20_H */
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.h b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.h
index 5441f55..d33b43c 100644
--- a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.h
+++ b/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__
-#define QOS_INIT_H_H3_V30__
+#ifndef QOS_INIT_H3_V30_H
+#define QOS_INIT_H3_V30_H
void qos_init_h3_v30(void);
-#endif /* QOS_INIT_H_H3_V20__ */
+#endif /* QOS_INIT_H3_V30_H */
diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.h b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.h
index 73fe694..46f3440 100644
--- a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.h
+++ b/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__
-#define QOS_INIT_H_H3N_V30__
+#ifndef QOS_INIT_H3N_V30_H
+#define QOS_INIT_H3N_V30_H
void qos_init_h3n_v30(void);
-#endif /* QOS_INIT_H_H3N_V30__ */
+#endif /* QOS_INIT_H3N_V30_H */
diff --git a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.h b/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.h
index 8371075..01ef46c 100644
--- a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.h
+++ b/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__
-#define QOS_INIT_H_M3_V10__
+#ifndef QOS_INIT_M3_V10_H
+#define QOS_INIT_M3_V10_H
void qos_init_m3_v10(void);
-#endif /* QOS_INIT_H_M3_V10__ */
+#endif /* QOS_INIT_M3_V10_H */
diff --git a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.h b/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.h
index 6e3bc57..1552fb6 100644
--- a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.h
+++ b/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__
-#define QOS_INIT_H_M3_V11__
+#ifndef QOS_INIT_M3_V11_H
+#define QOS_INIT_M3_V11_H
void qos_init_m3_v11(void);
-#endif /* QOS_INIT_H_M3_V11__ */
+#endif /* QOS_INIT_M3_V11_H */
diff --git a/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.h b/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.h
index ae7d2e2..0cd0c85 100644
--- a/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.h
+++ b/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__
-#define QOS_INIT_H_M3N_V10__
+#ifndef QOS_INIT_M3N_V10_H
+#define QOS_INIT_M3N_V10_H
void qos_init_m3n_v10(void);
-#endif /* QOS_INIT_H_M3N_V10__ */
+#endif /* QOS_INIT_M3N_V10_H */
diff --git a/drivers/staging/renesas/rcar/qos/qos_common.h b/drivers/staging/renesas/rcar/qos/qos_common.h
index a5963f3..0174d5b 100644
--- a/drivers/staging/renesas/rcar/qos/qos_common.h
+++ b/drivers/staging/renesas/rcar/qos/qos_common.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef QOS_COMMON_H_
-#define QOS_COMMON_H_
+#ifndef QOS_COMMON_H
+#define QOS_COMMON_H
#define RCAR_REF_DEFAULT (0U)
@@ -110,4 +110,4 @@
extern uint32_t qos_init_ddr_ch;
extern uint8_t qos_init_ddr_phyvalid;
-#endif /* QOS_COMMON_H_ */
+#endif /* QOS_COMMON_H */
diff --git a/drivers/staging/renesas/rcar/qos/qos_init.h b/drivers/staging/renesas/rcar/qos/qos_init.h
index d2f3ec8..1b64992 100644
--- a/drivers/staging/renesas/rcar/qos/qos_init.h
+++ b/drivers/staging/renesas/rcar/qos/qos_init.h
@@ -4,10 +4,10 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef QOS_INIT_H_
-#define QOS_INIT_H_
+#ifndef 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 */
diff --git a/drivers/staging/renesas/rcar/qos/qos_reg.h b/drivers/staging/renesas/rcar/qos/qos_reg.h
index 1bf70b2..759816f 100644
--- a/drivers/staging/renesas/rcar/qos/qos_reg.h
+++ b/drivers/staging/renesas/rcar/qos/qos_reg.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef QOS_REG_H_
-#define QOS_REG_H_
+#ifndef 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 */