diff --git a/drivers/gpu/nvgpu/hal/class/class_gm20b.h b/drivers/gpu/nvgpu/hal/class/class_gm20b.h
index 072028c8c..a86d6b217 100644
--- a/drivers/gpu/nvgpu/hal/class/class_gm20b.h
+++ b/drivers/gpu/nvgpu/hal/class/class_gm20b.h
@@ -21,7 +21,7 @@
  */
 
 #ifndef NVGPU_CLASS_GM20B
-#define NVGPU_CALSS_GM20B
+#define NVGPU_CLASS_GM20B
 
 #include <nvgpu/types.h>
 
@@ -29,4 +29,4 @@ bool gm20b_class_is_valid(u32 class_num);
 bool gm20b_class_is_valid_gfx(u32 class_num);
 bool gm20b_class_is_valid_compute(u32 class_num);
 
-#endif
+#endif /* NVGPU_CLASS_GM20B */
diff --git a/drivers/gpu/nvgpu/hal/class/class_gp10b.h b/drivers/gpu/nvgpu/hal/class/class_gp10b.h
index 6d5d4f152..d4e04296e 100644
--- a/drivers/gpu/nvgpu/hal/class/class_gp10b.h
+++ b/drivers/gpu/nvgpu/hal/class/class_gp10b.h
@@ -21,7 +21,7 @@
  */
 
 #ifndef NVGPU_CLASS_GP10B
-#define NVGPU_CALSS_GP10B
+#define NVGPU_CLASS_GP10B
 
 #include <nvgpu/types.h>
 
@@ -29,4 +29,4 @@ bool gp10b_class_is_valid(u32 class_num);
 bool gp10b_class_is_valid_gfx(u32 class_num);
 bool gp10b_class_is_valid_compute(u32 class_num);
 
-#endif
+#endif /* NVGPU_CLASS_GP10B */
diff --git a/drivers/gpu/nvgpu/hal/class/class_gv11b.h b/drivers/gpu/nvgpu/hal/class/class_gv11b.h
index 06d9f7e65..761a6ebc4 100644
--- a/drivers/gpu/nvgpu/hal/class/class_gv11b.h
+++ b/drivers/gpu/nvgpu/hal/class/class_gv11b.h
@@ -21,7 +21,7 @@
  */
 
 #ifndef NVGPU_CLASS_GV11B
-#define NVGPU_CALSS_GV11B
+#define NVGPU_CLASS_GV11B
 
 #include <nvgpu/types.h>
 
@@ -29,4 +29,4 @@ bool gv11b_class_is_valid(u32 class_num);
 bool gv11b_class_is_valid_gfx(u32 class_num);
 bool gv11b_class_is_valid_compute(u32 class_num);
 
-#endif
+#endif /* NVGPU_CLASS_GV11B */
diff --git a/drivers/gpu/nvgpu/hal/class/class_tu104.h b/drivers/gpu/nvgpu/hal/class/class_tu104.h
index 72b10c0a3..832dbd614 100644
--- a/drivers/gpu/nvgpu/hal/class/class_tu104.h
+++ b/drivers/gpu/nvgpu/hal/class/class_tu104.h
@@ -21,7 +21,7 @@
  */
 
 #ifndef NVGPU_CLASS_TU104
-#define NVGPU_CALSS_TU104
+#define NVGPU_CLASS_TU104
 
 #include <nvgpu/types.h>
 
@@ -29,4 +29,4 @@ bool tu104_class_is_valid(u32 class_num);
 bool tu104_class_is_valid_gfx(u32 class_num);
 bool tu104_class_is_valid_compute(u32 class_num);
 
-#endif
+#endif /* NVGPU_CLASS_TU104 */