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

Standardise header guards across codebase

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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 @@ typedef struct {
 extern uint32_t qos_init_ddr_ch;
 extern uint8_t qos_init_ddr_phyvalid;
 
-#endif /* QOS_COMMON_H_ */
+#endif /* QOS_COMMON_H */

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

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

include/bl1/bl1.h

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __BL1_FWU_H__
-#define __BL1_FWU_H__
+#ifndef BL1_H
+#define BL1_H
 
 #include <bl_common.h>
 
@@ -97,4 +97,4 @@ void bl1_calc_bl2_mem_layout(const meminfo_t *bl1_mem_layout,
 			meminfo_t *bl2_mem_layout);
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BL1_FWU_H__ */
+#endif /* BL1_H */

include/bl1/tbbr/tbbr_img_desc.h

@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TBBR_IMG_DESC_H__
-#define __TBBR_IMG_DESC_H__
+#ifndef TBBR_IMG_DESC_H
+#define TBBR_IMG_DESC_H
 
 #include <bl_common.h>
 
 extern image_desc_t bl1_tbbr_image_descs[];
 
-#endif /* __TBBR_IMG_DESC_H__ */
+#endif /* TBBR_IMG_DESC_H */

include/bl2/bl2.h

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef BL2_H__
-#define BL2_H__
+#ifndef BL2_H
+#define BL2_H
 
 void bl2_main(void);
 
-#endif /* BL2_H__ */
+#endif /* BL2_H */