26 files changed, 90 insertions, 90 deletions

diff --git a/drivers/gpu/nvgpu/include/nvgpu/allocator.h b/drivers/gpu/nvgpu/include/nvgpu/allocator.h
index d722673d..c444543e 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/allocator.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/allocator.h
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __NVGPU_ALLOCATOR_H__
-#define __NVGPU_ALLOCATOR_H__
+#ifndef NVGPU_ALLOCATOR_H
+#define NVGPU_ALLOCATOR_H
 
 #ifdef __KERNEL__
 /*
diff --git a/drivers/gpu/nvgpu/include/nvgpu/atomic.h b/drivers/gpu/nvgpu/include/nvgpu/atomic.h
index 12d1c86e..3edc1fc6 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/atomic.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/atomic.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,8 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#ifndef __NVGPU_ATOMIC_H__
-#define __NVGPU_ATOMIC_H__
+#ifndef NVGPU_ATOMIC_H
+#define NVGPU_ATOMIC_H
 
 #ifdef __KERNEL__
 #include <nvgpu/linux/atomic.h>
@@ -127,4 +127,4 @@ static inline long nvgpu_atomic64_sub_return(long x, nvgpu_atomic64_t *v)
         return __nvgpu_atomic64_sub_return(x, v);
 }
 
-#endif /* __NVGPU_ATOMIC_H__ */
+#endif /* NVGPU_ATOMIC_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/barrier.h b/drivers/gpu/nvgpu/include/nvgpu/barrier.h
index 49b10b86..f0b6b2b1 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/barrier.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/barrier.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,8 +25,8 @@
  * should provide their own OS specific calls under this common API
  */
 
-#ifndef __NVGPU_BARRIER_H__
-#define __NVGPU_BARRIER_H__
+#ifndef NVGPU_BARRIER_H
+#define NVGPU_BARRIER_H
 
 #ifdef __KERNEL__
 #include <nvgpu/linux/barrier.h>
@@ -58,4 +58,4 @@
 #define nvgpu_speculation_barrier()
 #endif
 
-#endif /* __NVGPU_BARRIER_H__ */
+#endif /* NVGPU_BARRIER_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/bitops.h b/drivers/gpu/nvgpu/include/nvgpu/bitops.h
index b6666930..00336d02 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/bitops.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/bitops.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,8 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#ifndef __NVGPU_BITOPS_H__
-#define __NVGPU_BITOPS_H__
+#ifndef NVGPU_BITOPS_H
+#define NVGPU_BITOPS_H
 
 #include <nvgpu/types.h>
 
@@ -41,4 +41,4 @@
 #include <nvgpu_rmos/include/bitops.h>
 #endif
 
-#endif
+#endif /* NVGPU_BITOPS_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/bug.h b/drivers/gpu/nvgpu/include/nvgpu/bug.h
index 671439a1..3d139b75 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/bug.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/bug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,8 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#ifndef __NVGPU_BUG_H__
-#define __NVGPU_BUG_H__
+#ifndef NVGPU_BUG_H
+#define NVGPU_BUG_H
 
 #ifdef __KERNEL__
 #include <linux/bug.h>
@@ -30,4 +30,4 @@
 #include <nvgpu_rmos/include/bug.h>
 #endif
 
-#endif
+#endif /* NVGPU_BUG_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/comptags.h b/drivers/gpu/nvgpu/include/nvgpu/comptags.h
index 3e87259e..3df1b6fc 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/comptags.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/comptags.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __NVGPU_COMPTAGS__
-#define __NVGPU_COMPTAGS__
+#ifndef NVGPU_COMPTAGS_H
+#define NVGPU_COMPTAGS_H
 
 #include <nvgpu/lock.h>
 #include <nvgpu/types.h>
@@ -101,4 +101,4 @@ bool gk20a_comptags_start_clear(struct nvgpu_os_buffer *buf);
 void gk20a_comptags_finish_clear(struct nvgpu_os_buffer *buf,
                                  bool clear_successful);
 
-#endif
+#endif /* NVGPU_COMPTAGS_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/cond.h b/drivers/gpu/nvgpu/include/nvgpu/cond.h
index 340fb460..49e9d1f9 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/cond.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/cond.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __NVGPU_COND_H__
-#define __NVGPU_COND_H__
+#ifndef NVGPU_COND_H
+#define NVGPU_COND_H
 
 #ifdef __KERNEL__
 #include <nvgpu/linux/cond.h>
@@ -103,4 +103,4 @@ int nvgpu_cond_broadcast_interruptible(struct nvgpu_cond *cond);
  */
 void nvgpu_cond_destroy(struct nvgpu_cond *cond);
 
-#endif /* __NVGPU_COND_H__ */
+#endif /* NVGPU_COND_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/enabled.h b/drivers/gpu/nvgpu/include/nvgpu/enabled.h
index 54c4d61c..ccf60546 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/enabled.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/enabled.h
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __NVGPU_ENABLED_H__
-#define __NVGPU_ENABLED_H__
+#ifndef NVGPU_ENABLED_H
+#define NVGPU_ENABLED_H
 
 struct gk20a;
 
@@ -199,4 +199,4 @@ void __nvgpu_set_enabled(struct gk20a *g, int flag, bool state);
 int nvgpu_init_enabled_flags(struct gk20a *g);
 void nvgpu_free_enabled_flags(struct gk20a *g);
 
-#endif
+#endif /* NVGPU_ENABLED_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/falcon.h b/drivers/gpu/nvgpu/include/nvgpu/falcon.h
index 4541f228..9f8c97ea 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/falcon.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/falcon.h
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __FALCON_H__
-#define __FALCON_H__
+#ifndef NVGPU_FALCON_H
+#define NVGPU_FALCON_H
 
 #include <nvgpu/types.h>
 #include <nvgpu/lock.h>
@@ -320,4 +320,4 @@ void nvgpu_flcn_queue_free(struct nvgpu_falcon *flcn,
 
 int nvgpu_flcn_sw_init(struct gk20a *g, u32 flcn_id);
 
-#endif /* __FALCON_H__ */
+#endif /* NVGPU_FALCON_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/flcnif_cmn.h b/drivers/gpu/nvgpu/include/nvgpu/flcnif_cmn.h
index d146cac7..ab27e6c6 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/flcnif_cmn.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/flcnif_cmn.h
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __FLCNIFCMN_H__
-#define __FLCNIFCMN_H__
+#ifndef NVGPU_FLCNIF_CMN_H
+#define NVGPU_FLCNIF_CMN_H
 
 #define PMU_CMD_SUBMIT_PAYLOAD_PARAMS_FB_SIZE_UNUSED 0
 
@@ -116,4 +116,4 @@ typedef u8 flcn_status;
 
 #define NV_UNSIGNED_ROUNDED_DIV(a, b)    (((a) + ((b) / 2)) / (b))
 
-#endif /* _FLCNIFCMN_H_*/
+#endif /* NVGPU_FLCNIF_CMN_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gmmu.h b/drivers/gpu/nvgpu/include/nvgpu/gmmu.h
index aa110f18..a70015f8 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gmmu.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gmmu.h
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __NVGPU_GMMU_H__
-#define __NVGPU_GMMU_H__
+#ifndef NVGPU_GMMU_H
+#define NVGPU_GMMU_H
 
 #include <nvgpu/types.h>
 #include <nvgpu/nvgpu_mem.h>
@@ -336,4 +336,4 @@ int __nvgpu_set_pte(struct gk20a *g, struct vm_gk20a *vm, u64 vaddr, u32 *pte);
                         nvgpu_log(g, gpu_dbg_pte, fmt, ##args);         \
         } while (0)
 
-#endif
+#endif /* NVGPU_GMMU_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/kmem.h b/drivers/gpu/nvgpu/include/nvgpu/kmem.h
index 852f6f8a..61f90bf5 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/kmem.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/kmem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __NVGPU_KMEM_H__
-#define __NVGPU_KMEM_H__
+#ifndef NVGPU_KMEM_H
+#define NVGPU_KMEM_H
 
 #include <nvgpu/types.h>
 #include <nvgpu/utils.h>
@@ -282,4 +282,4 @@ static inline void *nvgpu_big_zalloc(struct gk20a *g, size_t size)
  */
 void nvgpu_big_free(struct gk20a *g, void *p);
 
-#endif /* __NVGPU_KMEM_H__ */
+#endif /* NVGPU_KMEM_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/kref.h b/drivers/gpu/nvgpu/include/nvgpu/kref.h
index 2cbc07bc..486040e8 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/kref.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/kref.h
@@ -23,8 +23,8 @@
 /*
  * The following structure is used for reference counting of objects in nvgpu.
  */
-#ifndef __NVGPU_KREF_H__
-#define __NVGPU_KREF_H__
+#ifndef NVGPU_KREF_H
+#define NVGPU_KREF_H
 
 #include <nvgpu/atomic.h>
 
@@ -84,4 +84,4 @@ static inline int __must_check nvgpu_ref_get_unless_zero(struct nvgpu_ref *ref)
         return nvgpu_atomic_add_unless(&ref->refcount, 1, 0);
 }
 
-#endif /* __NVGPU_KREF_H__ */
+#endif /* NVGPU_KREF_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/log.h b/drivers/gpu/nvgpu/include/nvgpu/log.h
index e64c72f3..70a16762 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/log.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/log.h
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __NVGPU_DEBUGGING_H__
-#define __NVGPU_DEBUGGING_H__
+#ifndef NVGPU_LOG_H
+#define NVGPU_LOG_H
 
 #include <nvgpu/types.h>
 #include <nvgpu/bitops.h>
@@ -180,4 +180,4 @@ extern u64 nvgpu_dbg_mask;
 #define gk20a_dbg_fn(fmt, arg...)       gk20a_dbg(gpu_dbg_fn, fmt, ##arg)
 #define gk20a_dbg_info(fmt, arg...)     gk20a_dbg(gpu_dbg_info, fmt, ##arg)
 
-#endif
+#endif /* NVGPU_LOG_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/mm.h b/drivers/gpu/nvgpu/include/nvgpu/mm.h
index 45641092..01063bc1 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/mm.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/mm.h
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __NVGPU_MM_H__
-#define __NVGPU_MM_H__
+#ifndef NVGPU_MM_H
+#define NVGPU_MM_H
 
 #include <nvgpu/types.h>
 #include <nvgpu/cond.h>
@@ -220,4 +220,4 @@ int nvgpu_mm_suspend(struct gk20a *g);
 u32 nvgpu_mm_get_default_big_page_size(struct gk20a *g);
 u32 nvgpu_mm_get_available_big_page_sizes(struct gk20a *g);
 
-#endif
+#endif /* NVGPU_MM_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h
index 07a088f0..e69274b5 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __NVGPU_NVGPU_MEM_H__
-#define __NVGPU_NVGPU_MEM_H__
+#ifndef NVGPU_MEM_H
+#define NVGPU_MEM_H
 
 #include <nvgpu/types.h>
 #include <nvgpu/list.h>
@@ -347,4 +347,4 @@ u32 nvgpu_aperture_mask(struct gk20a *g, struct nvgpu_mem *mem,
 
 u64 nvgpu_mem_iommu_translate(struct gk20a *g, u64 phys);
 
-#endif
+#endif /* NVGPU_MEM_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvlink.h b/drivers/gpu/nvgpu/include/nvgpu/nvlink.h
index aa1b62c5..a74111cd 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/nvlink.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/nvlink.h
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __NVGPU_NVLINK_H__
-#define __NVGPU_NVLINK_H__
+#ifndef NVGPU_NVLINK_H
+#define NVGPU_NVLINK_H
 
 #include <nvgpu/types.h>
 
@@ -234,4 +234,4 @@ int nvgpu_nvlink_remove(struct gk20a *g);
 
 void nvgpu_mss_nvlink_init_credits(struct gk20a *g);
 
-#endif /* __NVGPU_NVLINK_H__ */
+#endif /* NVGPU_NVLINK_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/pramin.h b/drivers/gpu/nvgpu/include/nvgpu/pramin.h
index c9f54a6f..b0914bc1 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/pramin.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/pramin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __NVGPU_PRAMIN_H__
-#define __NVGPU_PRAMIN_H__
+#ifndef NVGPU_PRAMIN_H
+#define NVGPU_PRAMIN_H
 
 #include <nvgpu/types.h>
 
@@ -36,4 +36,4 @@ void nvgpu_pramin_memset(struct gk20a *g, struct nvgpu_mem *mem, u32 start, u32
 
 void nvgpu_init_pramin(struct mm_gk20a *mm);
 
-#endif
+#endif /* NVGPU_PRAMIN_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/rbtree.h b/drivers/gpu/nvgpu/include/nvgpu/rbtree.h
index 25740863..bcbbabbd 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/rbtree.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/rbtree.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __NVGPU_RBTREE_H__
-#define __NVGPU_RBTREE_H__
+#ifndef NVGPU_RBTREE_H
+#define NVGPU_RBTREE_H
 
 #include <nvgpu/types.h>
 
@@ -127,4 +127,4 @@ void nvgpu_rbtree_enum_start(u64 key_start,
 void nvgpu_rbtree_enum_next(struct nvgpu_rbtree_node **node,
                        struct nvgpu_rbtree_node *root);
 
-#endif /* __NVGPU_RBTREE_H__ */
+#endif /* NVGPU_RBTREE_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/rwsem.h b/drivers/gpu/nvgpu/include/nvgpu/rwsem.h
index 4facf138..3cca9c57 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/rwsem.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/rwsem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,8 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#ifndef __NVGPU_RWSEM_H__
-#define __NVGPU_RWSEM_H__
+#ifndef NVGPU_RWSEM_H
+#define NVGPU_RWSEM_H
 
 #ifdef __KERNEL__
 #include <nvgpu/linux/rwsem.h>
@@ -45,4 +45,4 @@ void nvgpu_rwsem_down_read(struct nvgpu_rwsem *rwsem);
 void nvgpu_rwsem_up_write(struct nvgpu_rwsem *rwsem);
 void nvgpu_rwsem_down_write(struct nvgpu_rwsem *rwsem);
 
-#endif
+#endif /* NVGPU_RWSEM_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/sim.h b/drivers/gpu/nvgpu/include/nvgpu/sim.h
index 41cee8d0..1d6b15dd 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/sim.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/sim.h
@@ -19,8 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#ifndef __NVGPU_SIM_H__
-#define __NVGPU_SIM_H__
+#ifndef NVGPU_SIM_H
+#define NVGPU_SIM_H
 
 #include <nvgpu/nvgpu_mem.h>
 
@@ -55,4 +55,4 @@ void nvgpu_free_sim_buffer(struct gk20a *g, struct nvgpu_mem *mem);
 void nvgpu_free_sim_support(struct gk20a *g);
 void nvgpu_remove_sim_support(struct gk20a *g);
 
-#endif
+#endif /* NVGPU_SIM_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/sizes.h b/drivers/gpu/nvgpu/include/nvgpu/sizes.h
index 588e772d..af5e4b27 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/sizes.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/sizes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -19,8 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#ifndef __NVGPU_SIZES_H__
-#define __NVGPU_SIZES_H__
+#ifndef NVGPU_SIZES_H
+#define NVGPU_SIZES_H
 
 #ifdef __KERNEL__
 #include <linux/sizes.h>
@@ -30,4 +30,4 @@
 #include <nvgpu_rmos/include/sizes.h>
 #endif
 
-#endif
+#endif /* NVGPU_SIZES_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/thread.h b/drivers/gpu/nvgpu/include/nvgpu/thread.h
index 316ca146..b113f972 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/thread.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/thread.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __NVGPU_THREAD_H__
-#define __NVGPU_THREAD_H__
+#ifndef NVGPU_THREAD_H
+#define NVGPU_THREAD_H
 
 #ifdef __KERNEL__
 #include <nvgpu/linux/thread.h>
@@ -80,4 +80,4 @@ bool nvgpu_thread_should_stop(struct nvgpu_thread *thread);
  */
 bool nvgpu_thread_is_running(struct nvgpu_thread *thread);
 
-#endif /* __NVGPU_THREAD_H__ */
+#endif /* NVGPU_THREAD_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/timers.h b/drivers/gpu/nvgpu/include/nvgpu/timers.h
index 20becfdd..f69e2349 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/timers.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/timers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __NVGPU_TIMERS_H__
-#define __NVGPU_TIMERS_H__
+#ifndef NVGPU_TIMERS_H
+#define NVGPU_TIMERS_H
 
 #include <nvgpu/types.h>
 #include <nvgpu/utils.h>
@@ -113,4 +113,4 @@ s64 nvgpu_current_time_ms(void);
 s64 nvgpu_current_time_ns(void);
 u64 nvgpu_hr_timestamp(void);
 
-#endif
+#endif /* NVGPU_TIMERS_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/types.h b/drivers/gpu/nvgpu/include/nvgpu/types.h
index d4d88d4d..3295af26 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/types.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/types.h
@@ -19,8 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#ifndef __NVGPU_TYPES_H__
-#define __NVGPU_TYPES_H__
+#ifndef NVGPU_TYPES_H
+#define NVGPU_TYPES_H
 
 #ifdef __KERNEL__
 #include <linux/types.h>
@@ -67,4 +67,4 @@
 #define U8_MAX ((u8)255)
 #endif
 
-#endif
+#endif /* NVGPU_TYPES_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/vm.h b/drivers/gpu/nvgpu/include/nvgpu/vm.h
index 23dac0ac..66749717 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/vm.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/vm.h
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __NVGPU_VM_H__
-#define __NVGPU_VM_H__
+#ifndef NVGPU_VM_H
+#define NVGPU_VM_H
 
 #include <nvgpu/kref.h>
 #include <nvgpu/list.h>
@@ -326,4 +326,4 @@ u64 __nvgpu_vm_alloc_va(struct vm_gk20a *vm, u64 size,
 int __nvgpu_vm_free_va(struct vm_gk20a *vm, u64 addr,
                                 u32 pgsz_idx);
 
-#endif
+#endif /* NVGPU_VM_H */