summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/arm/ccn/ccn_private.h6
-rw-r--r--drivers/arm/gic/common/gic_common_private.h6
-rw-r--r--drivers/arm/gic/v2/gicv2_private.h6
-rw-r--r--drivers/arm/gic/v3/gicv3_private.h6
-rw-r--r--drivers/imx/timer/imx_gpt.h6
-rw-r--r--drivers/imx/uart/imx_uart.h6
-rw-r--r--drivers/imx/usdhc/imx_usdhc.h6
-rw-r--r--drivers/marvell/comphy.h7
-rw-r--r--drivers/marvell/comphy/comphy-cp110.h7
-rw-r--r--drivers/marvell/comphy/phy-comphy-3700.h6
-rw-r--r--drivers/marvell/comphy/phy-comphy-common.h6
-rw-r--r--drivers/marvell/comphy/phy-default-porting-layer.h6
-rw-r--r--drivers/marvell/mc_trustzone/mc_trustzone.h6
-rw-r--r--drivers/marvell/uart/a3700_console.h6
-rw-r--r--drivers/renesas/rcar/avs/avs_driver.h6
-rw-r--r--drivers/renesas/rcar/board/board.h6
-rw-r--r--drivers/renesas/rcar/console/rcar_printf.h6
-rw-r--r--drivers/renesas/rcar/delay/micro_delay.h6
-rw-r--r--drivers/renesas/rcar/emmc/emmc_config.h6
-rw-r--r--drivers/renesas/rcar/emmc/emmc_def.h6
-rw-r--r--drivers/renesas/rcar/emmc/emmc_hal.h6
-rw-r--r--drivers/renesas/rcar/emmc/emmc_registers.h6
-rw-r--r--drivers/renesas/rcar/emmc/emmc_std.h6
-rw-r--r--drivers/renesas/rcar/iic_dvfs/iic_dvfs.h6
-rw-r--r--drivers/renesas/rcar/io/io_common.h6
-rw-r--r--drivers/renesas/rcar/io/io_emmcdrv.h6
-rw-r--r--drivers/renesas/rcar/io/io_memdrv.h6
-rw-r--r--drivers/renesas/rcar/io/io_private.h6
-rw-r--r--drivers/renesas/rcar/io/io_rcar.h6
-rw-r--r--drivers/renesas/rcar/pwrc/pwrc.h6
-rw-r--r--drivers/renesas/rcar/rom/rom_api.h6
-rw-r--r--drivers/renesas/rcar/rpc/rpc_registers.h6
-rw-r--r--drivers/staging/renesas/rcar/ddr/boot_init_dram.h6
-rw-r--r--drivers/staging/renesas/rcar/ddr/ddr_a/boot_init_dram_regdef_e3.h12
-rw-r--r--drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.h9
-rw-r--r--drivers/staging/renesas/rcar/ddr/dram_sub_func.h6
-rw-r--r--drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.h6
-rw-r--r--drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.h6
-rw-r--r--drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.h6
-rw-r--r--drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.h6
-rw-r--r--drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.h6
-rw-r--r--drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.h6
-rw-r--r--drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.h6
-rw-r--r--drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.h6
-rw-r--r--drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.h6
-rw-r--r--drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.h6
-rw-r--r--drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.h6
-rw-r--r--drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.h6
-rw-r--r--drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.h6
-rw-r--r--drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.h6
-rw-r--r--drivers/staging/renesas/rcar/qos/qos_common.h6
-rw-r--r--drivers/staging/renesas/rcar/qos/qos_init.h6
-rw-r--r--drivers/staging/renesas/rcar/qos/qos_reg.h6
53 files changed, 163 insertions, 166 deletions
diff --git a/drivers/arm/ccn/ccn_private.h b/drivers/arm/ccn/ccn_private.h
index c17c2742..8a936d97 100644
--- a/drivers/arm/ccn/ccn_private.h
+++ b/drivers/arm/ccn/ccn_private.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __CCN_PRIVATE_H__
-#define __CCN_PRIVATE_H__
+#ifndef CCN_PRIVATE_H
+#define CCN_PRIVATE_H
/*
* A CCN implementation can have a maximum of 64 Request nodes with node IDs
@@ -230,4 +230,4 @@ static inline unsigned int count_set_bits(unsigned long long bitmap)
#define CCN_GET_HN_NODEID_MAP(periphbase, mn_hn_id_reg_offset) \
ccn_reg_read(periphbase, MN_REGION_ID, mn_hn_id_reg_offset)
-#endif /* __CCN_PRIVATE_H__ */
+#endif /* CCN_PRIVATE_H */
diff --git a/drivers/arm/gic/common/gic_common_private.h b/drivers/arm/gic/common/gic_common_private.h
index fa34e477..9d9e8c7b 100644
--- a/drivers/arm/gic/common/gic_common_private.h
+++ b/drivers/arm/gic/common/gic_common_private.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef GIC_COMMON_PRIVATE_H_
-#define GIC_COMMON_PRIVATE_H_
+#ifndef GIC_COMMON_PRIVATE_H
+#define GIC_COMMON_PRIVATE_H
#include <gic_common.h>
#include <mmio.h>
@@ -85,4 +85,4 @@ void gicd_set_icactiver(uintptr_t base, unsigned int id);
void gicd_set_ipriorityr(uintptr_t base, unsigned int id, unsigned int pri);
void gicd_set_icfgr(uintptr_t base, unsigned int id, unsigned int cfg);
-#endif /* GIC_COMMON_PRIVATE_H_ */
+#endif /* GIC_COMMON_PRIVATE_H */
diff --git a/drivers/arm/gic/v2/gicv2_private.h b/drivers/arm/gic/v2/gicv2_private.h
index 1eb6d9d5..ccfad78c 100644
--- a/drivers/arm/gic/v2/gicv2_private.h
+++ b/drivers/arm/gic/v2/gicv2_private.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __GICV2_PRIVATE_H__
-#define __GICV2_PRIVATE_H__
+#ifndef GICV2_PRIVATE_H
+#define GICV2_PRIVATE_H
#include <gicv2.h>
#include <mmio.h>
@@ -146,4 +146,4 @@ static inline void gicc_write_dir(uintptr_t base, unsigned int val)
mmio_write_32(base + GICC_DIR, val);
}
-#endif /* __GICV2_PRIVATE_H__ */
+#endif /* GICV2_PRIVATE_H */
diff --git a/drivers/arm/gic/v3/gicv3_private.h b/drivers/arm/gic/v3/gicv3_private.h
index 85231ad9..188e7116 100644
--- a/drivers/arm/gic/v3/gicv3_private.h
+++ b/drivers/arm/gic/v3/gicv3_private.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __GICV3_PRIVATE_H__
-#define __GICV3_PRIVATE_H__
+#ifndef GICV3_PRIVATE_H
+#define GICV3_PRIVATE_H
#include <assert.h>
#include <gic_common.h>
@@ -387,4 +387,4 @@ static inline void gits_wait_for_quiescent_bit(uintptr_t gits_base)
}
-#endif /* __GICV3_PRIVATE_H__ */
+#endif /* GICV3_PRIVATE_H */
diff --git a/drivers/imx/timer/imx_gpt.h b/drivers/imx/timer/imx_gpt.h
index 6416c3cb..24326330 100644
--- a/drivers/imx/timer/imx_gpt.h
+++ b/drivers/imx/timer/imx_gpt.h
@@ -4,11 +4,11 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __IMX_GPT_H__
-#define __IMX_GPT_H__
+#ifndef IMX_GPT_H
+#define IMX_GPT_H
#include <stdint.h>
void imx_gpt_ops_init(uintptr_t reg_base);
-#endif /* __IMX_GPT_H__ */
+#endif /* IMX_GPT_H */
diff --git a/drivers/imx/uart/imx_uart.h b/drivers/imx/uart/imx_uart.h
index de421256..c3edbc72 100644
--- a/drivers/imx/uart/imx_uart.h
+++ b/drivers/imx/uart/imx_uart.h
@@ -3,8 +3,8 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __IMX_CONSOLE_H__
-#define __IMX_CONSOLE_H__
+#ifndef IMX_UART_H
+#define IMX_UART_H
#define IMX_UART_RXD_OFFSET 0x00
#define IMX_UART_RXD_CHARRDY BIT(15)
@@ -150,4 +150,4 @@
#define IMX_UART_TS_RXFULL BIT(3)
#define IMX_UART_TS_SOFTRST BIT(0)
-#endif /* __IMX_UART_H__ */
+#endif /* IMX_UART_H */
diff --git a/drivers/imx/usdhc/imx_usdhc.h b/drivers/imx/usdhc/imx_usdhc.h
index 6214cc14..9ff3298d 100644
--- a/drivers/imx/usdhc/imx_usdhc.h
+++ b/drivers/imx/usdhc/imx_usdhc.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef __IMX_USDHC_H__
-#define __IMX_USDHC_H__
+#ifndef IMX_USDHC_H
+#define IMX_USDHC_H
#include <mmc.h>
@@ -134,4 +134,4 @@ void imx_usdhc_init(imx_usdhc_params_t *params,
#define mmio_clrbits32(addr, clear) mmio_write_32(addr, mmio_read_32(addr) & ~(clear))
#define mmio_setbits32(addr, set) mmio_write_32(addr, mmio_read_32(addr) | (set))
-#endif /* __IMX_USDHC_H__ */
+#endif /* IMX_USDHC_H */
diff --git a/drivers/marvell/comphy.h b/drivers/marvell/comphy.h
index 788b1b60..fab564ef 100644
--- a/drivers/marvell/comphy.h
+++ b/drivers/marvell/comphy.h
@@ -7,8 +7,8 @@
/* Driver for COMPHY unit that is part or Marvell A8K SoCs */
-#ifndef _COMPHY_H_
-#define _COMPHY_H_
+#ifndef COMPHY_H
+#define COMPHY_H
/* COMPHY registers */
#define COMMON_PHY_CFG1_REG 0x0
@@ -469,5 +469,4 @@
#define HPIPE_GLOBAL_PM_RXDLOZ_WAIT_MASK \
(0xFF << HPIPE_GLOBAL_PM_RXDLOZ_WAIT_OFFSET)
-#endif /* _COMPHY_H_ */
-
+#endif /* COMPHY_H */
diff --git a/drivers/marvell/comphy/comphy-cp110.h b/drivers/marvell/comphy/comphy-cp110.h
index 1d7aec88..6eb7fd0d 100644
--- a/drivers/marvell/comphy/comphy-cp110.h
+++ b/drivers/marvell/comphy/comphy-cp110.h
@@ -7,8 +7,8 @@
/* Marvell CP110 SoC COMPHY unit driver */
-#ifndef _PHY_COMPHY_CP110_H
-#define _PHY_COMPHY_CP110_H
+#ifndef COMPHY_CP110_H
+#define COMPHY_CP110_H
#define SD_ADDR(base, lane) (base + 0x1000 * lane)
#define HPIPE_ADDR(base, lane) (SD_ADDR(base, lane) + 0x800)
@@ -862,5 +862,4 @@
/* General defines */
#define PLL_LOCK_TIMEOUT 15000
-#endif /* _PHY_COMPHY_CP110_H */
-
+#endif /* COMPHY_CP110_H */
diff --git a/drivers/marvell/comphy/phy-comphy-3700.h b/drivers/marvell/comphy/phy-comphy-3700.h
index 714a41c5..1628e36c 100644
--- a/drivers/marvell/comphy/phy-comphy-3700.h
+++ b/drivers/marvell/comphy/phy-comphy-3700.h
@@ -5,8 +5,8 @@
* https://spdx.org/licenses
*/
-#ifndef _PHY_COMPHY_3700_H
-#define _PHY_COMPHY_3700_H
+#ifndef PHY_COMPHY_3700_H
+#define PHY_COMPHY_3700_H
#define PLL_SET_DELAY_US 600
#define COMPHY_PLL_TIMEOUT 1000
@@ -255,4 +255,4 @@ enum {
int mvebu_3700_comphy_is_pll_locked(uint8_t comphy_index, uint32_t comphy_mode);
int mvebu_3700_comphy_power_off(uint8_t comphy_index, uint32_t comphy_mode);
int mvebu_3700_comphy_power_on(uint8_t comphy_index, uint32_t comphy_mode);
-#endif /* _PHY_COMPHY_3700_H */
+#endif /* PHY_COMPHY_3700_H */
diff --git a/drivers/marvell/comphy/phy-comphy-common.h b/drivers/marvell/comphy/phy-comphy-common.h
index ba1a83ce..78c7a38f 100644
--- a/drivers/marvell/comphy/phy-comphy-common.h
+++ b/drivers/marvell/comphy/phy-comphy-common.h
@@ -7,8 +7,8 @@
/* Marvell CP110 ana A3700 common */
-#ifndef _PHY_COMPHY_COMMON_H
-#define _PHY_COMPHY_COMMON_H
+#ifndef PHY_COMPHY_COMMON_H
+#define PHY_COMPHY_COMMON_H
/* #define DEBUG_COMPHY */
#ifdef DEBUG_COMPHY
@@ -153,4 +153,4 @@ static inline void __unused reg_set16(uintptr_t addr, uint16_t data,
debug("new val 0x%x\n", mmio_read_16(addr));
}
-#endif /* _PHY_COMPHY_COMMON_H */
+#endif /* PHY_COMPHY_COMMON_H */
diff --git a/drivers/marvell/comphy/phy-default-porting-layer.h b/drivers/marvell/comphy/phy-default-porting-layer.h
index 39cd1819..b3ad7eb1 100644
--- a/drivers/marvell/comphy/phy-default-porting-layer.h
+++ b/drivers/marvell/comphy/phy-default-porting-layer.h
@@ -5,8 +5,8 @@
* https://spdx.org/licenses
*/
-#ifndef __PHY_DEFAULT_PORTING_LAYER_H
-#define __PHY_DEFAULT_PORTING_LAYER_H
+#ifndef PHY_DEFAULT_PORTING_LAYER_H
+#define PHY_DEFAULT_PORTING_LAYER_H
#define MAX_LANE_NR 6
@@ -48,4 +48,4 @@ static const struct sata_params
.valid = 0x1
},
};
-#endif /* __PHY_DEFAULT_PORTING_LAYER_H */
+#endif /* PHY_DEFAULT_PORTING_LAYER_H */
diff --git a/drivers/marvell/mc_trustzone/mc_trustzone.h b/drivers/marvell/mc_trustzone/mc_trustzone.h
index 8a069233..d36dcb5c 100644
--- a/drivers/marvell/mc_trustzone/mc_trustzone.h
+++ b/drivers/marvell/mc_trustzone/mc_trustzone.h
@@ -5,8 +5,8 @@
* https://spdx.org/licenses
*/
-#ifndef _MC_TRUSTZONE_H
-#define _MC_TRUSTZONE_H
+#ifndef MC_TRUSTZONE_H
+#define MC_TRUSTZONE_H
#include <addr_map.h>
@@ -24,4 +24,4 @@
void tz_enable_win(int ap_index, const struct addr_map_win *win, int win_id);
-#endif /* _MC_TRUSTZONE_H */
+#endif /* MC_TRUSTZONE_H */
diff --git a/drivers/marvell/uart/a3700_console.h b/drivers/marvell/uart/a3700_console.h
index 1831360e..de7c4fc5 100644
--- a/drivers/marvell/uart/a3700_console.h
+++ b/drivers/marvell/uart/a3700_console.h
@@ -5,8 +5,8 @@
* https://spdx.org/licenses
*/
-#ifndef __A3700_CONSOLE_H__
-#define __A3700_CONSOLE_H__
+#ifndef A3700_CONSOLE_H
+#define A3700_CONSOLE_H
/* MVEBU UART Registers */
#define UART_RX_REG 0x00
@@ -52,4 +52,4 @@
#define UART_CTRL_TXFIFO_RESET (1 << 15)
#define UARTLSR_TXFIFOEMPTY (1 << 6)
-#endif /* __A3700_CONSOLE_H__ */
+#endif /* A3700_CONSOLE_H */
diff --git a/drivers/renesas/rcar/avs/avs_driver.h b/drivers/renesas/rcar/avs/avs_driver.h
index e8689287..aa773b60 100644
--- a/drivers/renesas/rcar/avs/avs_driver.h
+++ b/drivers/renesas/rcar/avs/avs_driver.h
@@ -5,8 +5,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef AVS_DRIVER_H__
-#define AVS_DRIVER_H__
+#ifndef AVS_DRIVER_H
+#define AVS_DRIVER_H
/* AVS Setting. 1:enable / 0:disable */
#ifndef AVS_SETTING_ENABLE
@@ -17,4 +17,4 @@ void rcar_avs_init(void);
void rcar_avs_setting(void);
void rcar_avs_end(void);
-#endif /* AVS_DRIVER_H__ */
+#endif /* AVS_DRIVER_H */
diff --git a/drivers/renesas/rcar/board/board.h b/drivers/renesas/rcar/board/board.h
index 15d80b9b..7bb2a062 100644
--- a/drivers/renesas/rcar/board/board.h
+++ b/drivers/renesas/rcar/board/board.h
@@ -5,8 +5,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef BOARD_H_
-#define BOARD_H_
+#ifndef BOARD_H
+#define BOARD_H
#define BOARD_SALVATOR_X (0x00)
#define BOARD_KRIEK (0x01)
@@ -32,4 +32,4 @@ extern const char *g_board_tbl[];
int32_t rcar_get_board_type(uint32_t *type, uint32_t *rev);
-#endif
+#endif /* BOARD_H */
diff --git a/drivers/renesas/rcar/console/rcar_printf.h b/drivers/renesas/rcar/console/rcar_printf.h
index dd7a61b0..bcb00c34 100644
--- a/drivers/renesas/rcar/console/rcar_printf.h
+++ b/drivers/renesas/rcar/console/rcar_printf.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef RCAR_PRINTF_H__
-#define RCAR_PRINTF_H__
+#ifndef RCAR_PRINTF_H
+#define RCAR_PRINTF_H
#include <string.h>
@@ -16,4 +16,4 @@ int32_t rcar_log_init(void);
extern uint64_t rcar_stack_generic_timer[5];
#endif
-#endif
+#endif /* RCAR_PRINTF_H */
diff --git a/drivers/renesas/rcar/delay/micro_delay.h b/drivers/renesas/rcar/delay/micro_delay.h
index f5983949..458959fd 100644
--- a/drivers/renesas/rcar/delay/micro_delay.h
+++ b/drivers/renesas/rcar/delay/micro_delay.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef MICRO_DELAY_H__
-#define MICRO_DELAY_H__
+#ifndef MICRO_DELAY_H
+#define MICRO_DELAY_H
#define TMU3_MEASUREMENT (0)
@@ -23,4 +23,4 @@ uint32_t tcnt3_snapshot(void);
#endif
-#endif
+#endif /* MICRO_DELAY_H */
diff --git a/drivers/renesas/rcar/emmc/emmc_config.h b/drivers/renesas/rcar/emmc/emmc_config.h
index 16dcea19..686ccb99 100644
--- a/drivers/renesas/rcar/emmc/emmc_config.h
+++ b/drivers/renesas/rcar/emmc/emmc_config.h
@@ -10,8 +10,8 @@
*
*/
-#ifndef __EMMC_CONFIG_H__
-#define __EMMC_CONFIG_H__
+#ifndef EMMC_CONFIG_H
+#define EMMC_CONFIG_H
/* ************************ HEADER (INCLUDE) SECTION *********************** */
@@ -36,5 +36,5 @@
/* ********************************* CODE ********************************** */
-#endif /* #ifndef __EMMC_CONFIG_H__ */
+#endif /* EMMC_CONFIG_H */
/* ******************************** END ************************************ */
diff --git a/drivers/renesas/rcar/emmc/emmc_def.h b/drivers/renesas/rcar/emmc/emmc_def.h
index 2944515e..178c795b 100644
--- a/drivers/renesas/rcar/emmc/emmc_def.h
+++ b/drivers/renesas/rcar/emmc/emmc_def.h
@@ -10,8 +10,8 @@
*
*/
-#ifndef __EMMC_DEF_H__
-#define __EMMC_DEF_H__
+#ifndef EMMC_DEF_H
+#define EMMC_DEF_H
#include "emmc_std.h"
@@ -74,5 +74,5 @@ void emmc_write_error_info_func_no(uint16_t func_no);
/* ********************************* CODE ********************************** */
-#endif /* #define __EMMC_DEF_H__ */
+#endif /* EMMC_DEF_H */
/* ******************************** END ************************************ */
diff --git a/drivers/renesas/rcar/emmc/emmc_hal.h b/drivers/renesas/rcar/emmc/emmc_hal.h
index 633446c9..f0b7e9d7 100644
--- a/drivers/renesas/rcar/emmc/emmc_hal.h
+++ b/drivers/renesas/rcar/emmc/emmc_hal.h
@@ -10,8 +10,8 @@
*
*/
-#ifndef __EMMC_HAL_H__
-#define __EMMC_HAL_H__
+#ifndef EMMC_HAL_H
+#define EMMC_HAL_H
/* ************************ HEADER (INCLUDE) SECTION *********************** */
#include <stdint.h>
/* ***************** MACROS, CONSTANTS, COMPILATION FLAGS ****************** */
@@ -313,6 +313,6 @@ typedef struct {
/* ********************************* CODE ********************************** */
-#endif /* __EMMC_HAL_H__ */
+#endif /* EMMC_HAL_H */
/* ******************************** END ************************************ */
diff --git a/drivers/renesas/rcar/emmc/emmc_registers.h b/drivers/renesas/rcar/emmc/emmc_registers.h
index a670ab7e..55ff33d8 100644
--- a/drivers/renesas/rcar/emmc/emmc_registers.h
+++ b/drivers/renesas/rcar/emmc/emmc_registers.h
@@ -10,8 +10,8 @@
*
*/
-#ifndef __EMMC_REGISTERS_H__
-#define __EMMC_REGISTERS_H__
+#ifndef EMMC_REGISTERS_H
+#define EMMC_REGISTERS_H
/* ************************ HEADER (INCLUDE) SECTION *********************** */
@@ -256,5 +256,5 @@
/* ********************************* CODE ********************************** */
-#endif /* __EMMC_REGISTERS_H__ */
+#endif /* EMMC_REGISTERS_H */
/* ******************************** END ************************************ */
diff --git a/drivers/renesas/rcar/emmc/emmc_std.h b/drivers/renesas/rcar/emmc/emmc_std.h
index f4ce1981..99cb6b99 100644
--- a/drivers/renesas/rcar/emmc/emmc_std.h
+++ b/drivers/renesas/rcar/emmc/emmc_std.h
@@ -10,8 +10,8 @@
*
*/
-#ifndef __EMMC_STD_H__
-#define __EMMC_STD_H__
+#ifndef EMMC_STD_H
+#define EMMC_STD_H
#include "emmc_hal.h"
@@ -471,4 +471,4 @@ uint32_t emmc_get_csd_time(void);
/* ********************************* CODE ********************************** */
/* ******************************** END ************************************ */
-#endif /* __EMMC_STD_H__ */
+#endif /* EMMC_STD_H */
diff --git a/drivers/renesas/rcar/iic_dvfs/iic_dvfs.h b/drivers/renesas/rcar/iic_dvfs/iic_dvfs.h
index 3c4a9a55..2dec58f6 100644
--- a/drivers/renesas/rcar/iic_dvfs/iic_dvfs.h
+++ b/drivers/renesas/rcar/iic_dvfs/iic_dvfs.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef IIC_DVFS_H__
-#define IIC_DVFS_H__
+#ifndef IIC_DVFS_H
+#define IIC_DVFS_H
/* PMIC slave */
#define PMIC (0x30)
@@ -20,4 +20,4 @@
int32_t rcar_iic_dvfs_receive(uint8_t slave, uint8_t reg, uint8_t *data);
int32_t rcar_iic_dvfs_send(uint8_t slave, uint8_t regr, uint8_t data);
-#endif
+#endif /* IIC_DVFS_H */
diff --git a/drivers/renesas/rcar/io/io_common.h b/drivers/renesas/rcar/io/io_common.h
index c5729b89..6eb77777 100644
--- a/drivers/renesas/rcar/io/io_common.h
+++ b/drivers/renesas/rcar/io/io_common.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef IO_COMMON_H__
-#define IO_COMMON_H__
+#ifndef IO_COMMON_H
+#define IO_COMMON_H
typedef struct io_drv_spec {
size_t offset;
@@ -13,4 +13,4 @@ typedef struct io_drv_spec {
uint32_t partition;
} io_drv_spec_t;
-#endif
+#endif /* IO_COMMON_H */
diff --git a/drivers/renesas/rcar/io/io_emmcdrv.h b/drivers/renesas/rcar/io/io_emmcdrv.h
index 82c6c516..95070f24 100644
--- a/drivers/renesas/rcar/io/io_emmcdrv.h
+++ b/drivers/renesas/rcar/io/io_emmcdrv.h
@@ -4,10 +4,10 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef IO_EMMCDRV_H__
-#define IO_EMMCDRV_H__
+#ifndef IO_EMMCDRV_H
+#define IO_EMMCDRV_H
struct io_dev_connector;
int32_t rcar_register_io_dev_emmcdrv(const io_dev_connector_t **connector);
-#endif
+#endif /* IO_EMMCDRV_H */
diff --git a/drivers/renesas/rcar/io/io_memdrv.h b/drivers/renesas/rcar/io/io_memdrv.h
index 41727d3a..90e68123 100644
--- a/drivers/renesas/rcar/io/io_memdrv.h
+++ b/drivers/renesas/rcar/io/io_memdrv.h
@@ -4,10 +4,10 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef IO_MEMDRV_H__
-#define IO_MEMDRV_H__
+#ifndef IO_MEMDRV_H
+#define IO_MEMDRV_H
struct io_dev_connector;
int32_t rcar_register_io_dev_memdrv(const io_dev_connector_t **connector);
-#endif
+#endif /* IO_MEMDRV_H */
diff --git a/drivers/renesas/rcar/io/io_private.h b/drivers/renesas/rcar/io/io_private.h
index d0e66c01..207523a7 100644
--- a/drivers/renesas/rcar/io/io_private.h
+++ b/drivers/renesas/rcar/io/io_private.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef IO_PRIVATE_H_
-#define IO_PRIVATE_H_
+#ifndef IO_PRIVATE_H
+#define IO_PRIVATE_H
/*
* Return codes reported by 'io_*' APIs
@@ -17,4 +17,4 @@
#define IO_NOT_SUPPORTED (-0x82)
#define IO_RESOURCES_EXHAUSTED (-0x83)
-#endif
+#endif /* IO_PRIVATE_H */
diff --git a/drivers/renesas/rcar/io/io_rcar.h b/drivers/renesas/rcar/io/io_rcar.h
index 24209024..c26a6176 100644
--- a/drivers/renesas/rcar/io/io_rcar.h
+++ b/drivers/renesas/rcar/io/io_rcar.h
@@ -4,11 +4,11 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef IO_RCAR_H__
-#define IO_RCAR_H__
+#ifndef IO_RCAR_H
+#define IO_RCAR_H
int32_t rcar_register_io_dev(const io_dev_connector_t **dev_con);
int32_t rcar_get_certificate(const int32_t name, uint32_t *cert);
void rcar_read_certificate(uint64_t cert, uint32_t *size, uintptr_t *dest);
-#endif
+#endif /* IO_RCAR_H */
diff --git a/drivers/renesas/rcar/pwrc/pwrc.h b/drivers/renesas/rcar/pwrc/pwrc.h
index 166886ec..3cdac694 100644
--- a/drivers/renesas/rcar/pwrc/pwrc.h
+++ b/drivers/renesas/rcar/pwrc/pwrc.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef RCAR_PWRC_H__
-#define RCAR_PWRC_H__
+#ifndef PWRC_H
+#define PWRC_H
#define PPOFFR_OFF 0x0
#define PPONR_OFF 0x4
@@ -74,4 +74,4 @@ extern uint64_t rcar_stack_generic_timer[5];
#endif
-#endif
+#endif /* PWRC_H */
diff --git a/drivers/renesas/rcar/rom/rom_api.h b/drivers/renesas/rcar/rom/rom_api.h
index 85105ef5..1d5b03d7 100644
--- a/drivers/renesas/rcar/rom/rom_api.h
+++ b/drivers/renesas/rcar/rom/rom_api.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef ROM_API_H__
-#define ROM_API_H__
+#ifndef ROM_API_H
+#define ROM_API_H
#include <stdint.h>
@@ -28,4 +28,4 @@ uint32_t rcar_rom_secure_boot_api(uint32_t *key, uint32_t *cert,
rom_read_flash_f f);
uint32_t rcar_rom_get_lcs(uint32_t *lcs);
-#endif
+#endif /* ROM_API_H */
diff --git a/drivers/renesas/rcar/rpc/rpc_registers.h b/drivers/renesas/rcar/rpc/rpc_registers.h
index 326519d7..79aea859 100644
--- a/drivers/renesas/rcar/rpc/rpc_registers.h
+++ b/drivers/renesas/rcar/rpc/rpc_registers.h
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#ifndef RPC_REGISTER_H__
-#define RPC_REGISTER_H__
+#ifndef RPC_REGISTERS_H
+#define RPC_REGISTERS_H
#define RPC_BASE (0xEE200000U)
#define RPC_CMNCR (RPC_BASE + 0x0000U)
@@ -22,4 +22,4 @@
#define RPC_PHYCNT (RPC_BASE + 0x007CU)
#define RPC_PHYINT (RPC_BASE + 0x0088U)
-#endif
+#endif /* RPC_REGISTERS_H */
diff --git a/drivers/staging/renesas/rcar/ddr/boot_init_dram.h b/drivers/staging/renesas/rcar/ddr/boot_init_dram.h
index 7ec2930a..4b0a9ebe 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 @@ extern int32_t rcar_dram_init(void);
#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 80e3eecc..8606f76d 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 @@ extern "C" {
#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 115765b1..47fe07ba 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 @@ extern int32_t rcar_dram_init(void);
#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 e083bfbb..7e88f422 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 041a778f..647a937d 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 844c1b99..2478e1c0 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 3f691f8e..b02f93eb 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 c6ee6939..70885de7 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 9e08e583..3e6f8794 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 ab82e963..2c1d8c58 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 e55f7746..f96182aa 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 759e58b3..3faeb4f7 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 59c1bdbb..9b7619ea 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 5441f55d..d33b43c5 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 73fe6949..46f34405 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 83710751..01ef46c2 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 6e3bc574..1552fb66 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 ae7d2e27..0cd0c85a 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 a5963f39..0174d5bf 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 @@ typedef struct {
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 d2f3ec8f..1b649928 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 1bf70b2f..759816fd 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 */