gpu: nvgpu: tu104: MISRA 21.2 header guard fixes

MISRA rule 21.2 doesn't allow the use of macro names which start with an underscore. These leading underscores are to be removed from the macro names. This patch will fix such violations in tu104 hw headers by renaming them to follow the convention, 'NVGPU_HEADER-NAME'. JIRA NVGPU-1028 Change-Id: Id5f46c5cb50765f178379b23f660f759fa881e9b Signed-off-by: smadhavan <smadhavan@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1921250 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Konsta Holtta <kholtta@nvidia.com> Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
2025-12-24 10:34:43 +03:00 · 2018-09-28 14:25:37 +05:30
parent 09755bad2f
commit e4f9bf5a47
42 changed files with 84 additions and 84 deletions
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_bus_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_bus_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_bus_tu104_h_
-#define _hw_bus_tu104_h_
+#ifndef NVGPU_HW_BUS_TU104_H
+#define NVGPU_HW_BUS_TU104_H

 static inline u32 bus_sw_scratch_r(u32 i)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ccsr_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ccsr_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_ccsr_tu104_h_
-#define _hw_ccsr_tu104_h_
+#ifndef NVGPU_HW_CCSR_TU104_H
+#define NVGPU_HW_CCSR_TU104_H

 static inline u32 ccsr_channel_inst_r(u32 i)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ce_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ce_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_ce_tu104_h_
-#define _hw_ce_tu104_h_
+#ifndef NVGPU_HW_CE_TU104_H
+#define NVGPU_HW_CE_TU104_H

 static inline u32 ce_intr_status_r(u32 i)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ctrl_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ctrl_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_ctrl_tu104_h_
-#define _hw_ctrl_tu104_h_
+#ifndef NVGPU_HW_CTRL_TU104_H
+#define NVGPU_HW_CTRL_TU104_H

 static inline u32 ctrl_doorbell_r(u32 i)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ctxsw_prog_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ctxsw_prog_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_ctxsw_prog_tu104_h_
-#define _hw_ctxsw_prog_tu104_h_
+#ifndef NVGPU_HW_CTXSW_PROG_TU104_H
+#define NVGPU_HW_CTXSW_PROG_TU104_H

 static inline u32 ctxsw_prog_fecs_header_v(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_falcon_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_falcon_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_falcon_tu104_h_
-#define _hw_falcon_tu104_h_
+#ifndef NVGPU_HW_FALCON_TU104_H
+#define NVGPU_HW_FALCON_TU104_H

 static inline u32 falcon_falcon_irqsset_r(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_fb_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_fb_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_fb_tu104_h_
-#define _hw_fb_tu104_h_
+#ifndef NVGPU_HW_FB_TU104_H
+#define NVGPU_HW_FB_TU104_H

 static inline u32 fb_fbhub_num_active_ltcs_r(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_fbpa_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_fbpa_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_fbpa_tu104_h_
-#define _hw_fbpa_tu104_h_
+#ifndef NVGPU_HW_FBPA_TU104_H
+#define NVGPU_HW_FBPA_TU104_H

 static inline u32 fbpa_0_intr_status_r(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_fifo_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_fifo_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_fifo_tu104_h_
-#define _hw_fifo_tu104_h_
+#ifndef NVGPU_HW_FIFO_TU104_H
+#define NVGPU_HW_FIFO_TU104_H

 static inline u32 fifo_userd_writeback_r(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_flush_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_flush_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_flush_tu104_h_
-#define _hw_flush_tu104_h_
+#ifndef NVGPU_HW_FLUSH_TU104_H
+#define NVGPU_HW_FLUSH_TU104_H

 static inline u32 flush_l2_system_invalidate_r(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_func_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_func_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_func_tu104_h_
-#define _hw_func_tu104_h_
+#ifndef NVGPU_HW_FUNC_TU104_H
+#define NVGPU_HW_FUNC_TU104_H

 static inline u32 func_full_phys_offset_v(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_fuse_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_fuse_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_fuse_tu104_h_
-#define _hw_fuse_tu104_h_
+#ifndef NVGPU_HW_FUSE_TU104_H
+#define NVGPU_HW_FUSE_TU104_H

 static inline u32 fuse_status_opt_gpc_r(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_gc6_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_gc6_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_gc6_tu104_h_
-#define _hw_gc6_tu104_h_
+#ifndef NVGPU_HW_GC6_TU104_H
+#define NVGPU_HW_GC6_TU104_H

 static inline u32 gc6_aon_secure_scratch_group_05_r(u32 i)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_gmmu_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_gmmu_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_gmmu_tu104_h_
-#define _hw_gmmu_tu104_h_
+#ifndef NVGPU_HW_GMMU_TU104_H
+#define NVGPU_HW_GMMU_TU104_H

 static inline u32 gmmu_new_pde_is_pte_w(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_gr_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_gr_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_gr_tu104_h_
-#define _hw_gr_tu104_h_
+#ifndef NVGPU_HW_GR_TU104_H
+#define NVGPU_HW_GR_TU104_H

 static inline u32 gr_intr_r(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ioctrl_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ioctrl_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_ioctrl_tu104_h_
-#define _hw_ioctrl_tu104_h_
+#ifndef NVGPU_HW_IOCTRL_TU104_H
+#define NVGPU_HW_IOCTRL_TU104_H

 static inline u32 ioctrl_reset_r(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ioctrlmif_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ioctrlmif_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_ioctrlmif_tu104_h_
-#define _hw_ioctrlmif_tu104_h_
+#ifndef NVGPU_HW_IOCTRLMIF_TU104_H
+#define NVGPU_HW_IOCTRLMIF_TU104_H

 static inline u32 ioctrlmif_rx_err_contain_en_0_r(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ltc_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ltc_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_ltc_tu104_h_
-#define _hw_ltc_tu104_h_
+#ifndef NVGPU_HW_LTC_TU104_H
+#define NVGPU_HW_LTC_TU104_H

 static inline u32 ltc_pltcg_base_v(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_mc_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_mc_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_mc_tu104_h_
-#define _hw_mc_tu104_h_
+#ifndef NVGPU_HW_MC_TU104_H
+#define NVGPU_HW_MC_TU104_H

 static inline u32 mc_boot_0_r(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_minion_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_minion_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_minion_tu104_h_
-#define _hw_minion_tu104_h_
+#ifndef NVGPU_HW_MINION_TU104_H
+#define NVGPU_HW_MINION_TU104_H

 static inline u32 minion_minion_status_r(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_nvl_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_nvl_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_nvl_tu104_h_
-#define _hw_nvl_tu104_h_
+#ifndef NVGPU_HW_NVL_TU104_H
+#define NVGPU_HW_NVL_TU104_H

 static inline u32 nvl_link_state_r(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_nvlinkip_discovery_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_nvlinkip_discovery_tu104.h
@@ -53,7 +53,7 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_nvlinkip_discovery_tu104_h_
-#define _hw_nvlinkip_discovery_tu104_h_
+#ifndef NVGPU_HW_NVLINKIP_DISCOVERY_TU104_H
+#define NVGPU_HW_NVLINKIP_DISCOVERY_TU104_H

 #endif
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_nvlipt_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_nvlipt_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_nvlipt_tu104_h_
-#define _hw_nvlipt_tu104_h_
+#ifndef NVGPU_HW_NVLIPT_TU104_H
+#define NVGPU_HW_NVLIPT_TU104_H

 static inline u32 nvlipt_intr_control_link0_r(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_nvtlc_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_nvtlc_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_nvtlc_tu104_h_
-#define _hw_nvtlc_tu104_h_
+#ifndef NVGPU_HW_NVTLC_TU104_H
+#define NVGPU_HW_NVTLC_TU104_H

 static inline u32 nvtlc_tx_err_report_en_0_r(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pbdma_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pbdma_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_pbdma_tu104_h_
-#define _hw_pbdma_tu104_h_
+#ifndef NVGPU_HW_PBDMA_TU104_H
+#define NVGPU_HW_PBDMA_TU104_H

 static inline u32 pbdma_gp_entry1_r(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_perf_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_perf_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_perf_tu104_h_
-#define _hw_perf_tu104_h_
+#ifndef NVGPU_HW_PERF_TU104_H
+#define NVGPU_HW_PERF_TU104_H

 static inline u32 perf_pmmgpc_perdomain_offset_v(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pnvdec_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pnvdec_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_pnvdec_tu104_h_
-#define _hw_pnvdec_tu104_h_
+#ifndef NVGPU_HW_PNVDEC_TU104_H
+#define NVGPU_HW_PNVDEC_TU104_H

 static inline u32 pnvdec_falcon_irqsset_r(u32 i)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pram_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pram_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_pram_tu104_h_
-#define _hw_pram_tu104_h_
+#ifndef NVGPU_HW_PRAM_TU104_H
+#define NVGPU_HW_PRAM_TU104_H

 static inline u32 pram_data032_r(u32 i)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pri_ringmaster_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pri_ringmaster_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_pri_ringmaster_tu104_h_
-#define _hw_pri_ringmaster_tu104_h_
+#ifndef NVGPU_HW_PRI_RINGMASTER_TU104_H
+#define NVGPU_HW_PRI_RINGMASTER_TU104_H

 static inline u32 pri_ringmaster_command_r(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pri_ringstation_gpc_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pri_ringstation_gpc_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_pri_ringstation_gpc_tu104_h_
-#define _hw_pri_ringstation_gpc_tu104_h_
+#ifndef NVGPU_HW_PRI_RINGSTATION_GPC_TU104_H
+#define NVGPU_HW_PRI_RINGSTATION_GPC_TU104_H

 static inline u32 pri_ringstation_gpc_gpc0_priv_error_adr_r(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pri_ringstation_sys_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pri_ringstation_sys_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_pri_ringstation_sys_tu104_h_
-#define _hw_pri_ringstation_sys_tu104_h_
+#ifndef NVGPU_HW_PRI_RINGSTATION_SYS_TU104_H
+#define NVGPU_HW_PRI_RINGSTATION_SYS_TU104_H

 static inline u32 pri_ringstation_sys_decode_config_r(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_proj_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_proj_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_proj_tu104_h_
-#define _hw_proj_tu104_h_
+#ifndef NVGPU_HW_PROJ_TU104_H
+#define NVGPU_HW_PROJ_TU104_H

 static inline u32 proj_gpc_base_v(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_psec_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_psec_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_psec_tu104_h_
-#define _hw_psec_tu104_h_
+#ifndef NVGPU_HW_PSEC_TU104_H
+#define NVGPU_HW_PSEC_TU104_H

 static inline u32 psec_falcon_irqsset_r(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pwr_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_pwr_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_pwr_tu104_h_
-#define _hw_pwr_tu104_h_
+#ifndef NVGPU_HW_PWR_TU104_H
+#define NVGPU_HW_PWR_TU104_H

 static inline u32 pwr_falcon_irqsset_r(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ram_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_ram_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_ram_tu104_h_
-#define _hw_ram_tu104_h_
+#ifndef NVGPU_HW_RAM_TU104_H
+#define NVGPU_HW_RAM_TU104_H

 static inline u32 ram_in_ramfc_s(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_therm_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_therm_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_therm_tu104_h_
-#define _hw_therm_tu104_h_
+#ifndef NVGPU_HW_THERM_TU104_H
+#define NVGPU_HW_THERM_TU104_H

 static inline u32 therm_weight_1_r(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_timer_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_timer_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_timer_tu104_h_
-#define _hw_timer_tu104_h_
+#ifndef NVGPU_HW_TIMER_TU104_H
+#define NVGPU_HW_TIMER_TU104_H

 static inline u32 timer_pri_timeout_r(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_top_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_top_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_top_tu104_h_
-#define _hw_top_tu104_h_
+#ifndef NVGPU_HW_TOP_TU104_H
+#define NVGPU_HW_TOP_TU104_H

 static inline u32 top_num_gpcs_r(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_trim_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_trim_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_trim_tu104_h_
-#define _hw_trim_tu104_h_
+#ifndef NVGPU_HW_TRIM_TU104_H
+#define NVGPU_HW_TRIM_TU104_H

 static inline u32 trim_sys_nvlink_uphy_cfg_r(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_usermode_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_usermode_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_usermode_tu104_h_
-#define _hw_usermode_tu104_h_
+#ifndef NVGPU_HW_USERMODE_TU104_H
+#define NVGPU_HW_USERMODE_TU104_H

 static inline u32 usermode_cfg0_r(void)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_xp_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_xp_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_xp_tu104_h_
-#define _hw_xp_tu104_h_
+#ifndef NVGPU_HW_XP_TU104_H
+#define NVGPU_HW_XP_TU104_H

 static inline u32 xp_dl_mgr_r(u32 i)
 {
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_xve_tu104.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/tu104/hw_xve_tu104.h
@@ -53,8 +53,8 @@
 *         comparison with unshifted values appropriate for use in field <y>
 *         of register <x>.
 */
-#ifndef _hw_xve_tu104_h_
-#define _hw_xve_tu104_h_
+#ifndef NVGPU_HW_XVE_TU104_H
+#define NVGPU_HW_XVE_TU104_H

 static inline u32 xve_rom_ctrl_r(void)
 {