25 files changed, 94 insertions, 92 deletions

diff --git a/drivers/gpu/nvgpu/include/nvgpu/bsearch.h b/drivers/gpu/nvgpu/include/nvgpu/bsearch.h
index 872701e6..46a2d049 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/bsearch.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/bsearch.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_BSEARCH_H__
-#define __NVGPU_BSEARCH_H__
+#ifndef NVGPU_BSEARCH_H
+#define NVGPU_BSEARCH_H
 
 #ifdef __KERNEL__
 #include <linux/bsearch.h>
@@ -28,4 +28,4 @@
 #include <stdlib.h>
 #endif
 
-#endif
+#endif /*NVGPU_BSEARCH_H*/
diff --git a/drivers/gpu/nvgpu/include/nvgpu/circ_buf.h b/drivers/gpu/nvgpu/include/nvgpu/circ_buf.h
index 4dd9e0d8..76998caf 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/circ_buf.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/circ_buf.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_CIRC_BUF_H__
-#define __NVGPU_CIRC_BUF_H__
+#ifndef NVGPU_CIRC_BUF_H
+#define NVGPU_CIRC_BUF_H
 
 #ifdef __KERNEL__
 #include <linux/circ_buf.h>
@@ -28,4 +28,4 @@
 #include <nvgpu/posix/circ_buf.h>
 #endif
 
-#endif
+#endif /* NVGPU_CIRC_BUF_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/clk_arb.h b/drivers/gpu/nvgpu/include/nvgpu/clk_arb.h
index e63545df..46952f1c 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/clk_arb.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/clk_arb.h
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __NVGPU_CLK_ARB_H__
-#define __NVGPU_CLK_ARB_H__
+#ifndef NVGPU_CLK_ARB_H
+#define NVGPU_CLK_ARB_H
 
 struct gk20a;
 
@@ -368,5 +368,5 @@ void nvgpu_clk_arb_event_post_event(struct nvgpu_clk_dev *dev);
 #ifdef CONFIG_DEBUG_FS
 int nvgpu_clk_arb_debugfs_init(struct gk20a *g);
 #endif
-#endif /* __NVGPU_CLK_ARB_H__ */
+#endif /* NVGPU_CLK_ARB_H */
 
diff --git a/drivers/gpu/nvgpu/include/nvgpu/ctxsw_trace.h b/drivers/gpu/nvgpu/include/nvgpu/ctxsw_trace.h
index 4eaf9bf0..2da6b837 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/ctxsw_trace.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/ctxsw_trace.h
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __NVGPU_CTXSW_TRACE_H__
-#define __NVGPU_CTXSW_TRACE_H__
+#ifndef NVGPU_CTXSW_TRACE_H
+#define NVGPU_CTXSW_TRACE_H
 
 #include <nvgpu/types.h>
 
@@ -90,4 +90,4 @@ int gk20a_ctxsw_dev_mmap_buffer(struct gk20a *g, struct vm_area_struct *vma);
 
 u8 nvgpu_gpu_ctxsw_tags_to_common_tags(u8 tags);
 
-#endif
+#endif /*NVGPU_CTXSW_TRACE_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/debug.h b/drivers/gpu/nvgpu/include/nvgpu/debug.h
index c2811319..900850c3 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/debug.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/debug.h
@@ -1,6 +1,8 @@
 /*
  * GK20A Debug functionality
  *
+ * Copyright (c) 2014-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"),
  * to deal in the Software without restriction, including without limitation
@@ -20,8 +22,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __NVGPU_DEBUG_H__
-#define __NVGPU_DEBUG_H__
+#ifndef NVGPU_DEBUG_H
+#define NVGPU_DEBUG_H
 
 struct gk20a;
 struct gpu_ops;
@@ -56,4 +58,4 @@ static inline void gk20a_debug_init(struct gk20a *g, const char *debugfs_symlink
 static inline void gk20a_debug_deinit(struct gk20a *g) {}
 #endif
 
-#endif /* __NVGPU_DEBUG_H__ */
+#endif /* NVGPU_DEBUG_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/dma.h b/drivers/gpu/nvgpu/include/nvgpu/dma.h
index f6f264cf..6a13e577 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/dma.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/dma.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_DMA_H__
-#define __NVGPU_DMA_H__
+#ifndef NVGPU_DMA_H
+#define NVGPU_DMA_H
 
 #include <nvgpu/types.h>
 
@@ -358,4 +358,4 @@ void nvgpu_dma_unmap_free(struct vm_gk20a *vm, struct nvgpu_mem *mem);
 void nvgpu_dma_free_sys(struct gk20a *g, struct nvgpu_mem *mem);
 void nvgpu_dma_free_vid(struct gk20a *g, struct nvgpu_mem *mem);
 
-#endif
+#endif /*  NVGPU_DMA_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/errno.h b/drivers/gpu/nvgpu/include/nvgpu/errno.h
index 12ba118e..7e8b1105 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/errno.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/errno.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_ERRNO_H__
-#define __NVGPU_ERRNO_H__
+#ifndef NVGPU_ERRNO_H
+#define NVGPU_ERRNO_H
 
 /*
  * Explicit include to get all the -E* error messages. Useful for header files
@@ -38,4 +38,4 @@
  * TODO: add else path above for QNX.
  */
 
-#endif
+#endif /* NVGPU_ERRNO_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/error_notifier.h b/drivers/gpu/nvgpu/include/nvgpu/error_notifier.h
index 3e70c379..7ba01e97 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/error_notifier.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/error_notifier.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_ERROR_NOTIFIER_H__
-#define __NVGPU_ERROR_NOTIFIER_H__
+#ifndef NVGPU_ERROR_NOTIFIER_H
+#define NVGPU_ERROR_NOTIFIER_H
 
 #include <nvgpu/types.h>
 
@@ -46,4 +46,4 @@ void nvgpu_set_error_notifier(struct channel_gk20a *ch, u32 error);
 void nvgpu_set_error_notifier_if_empty(struct channel_gk20a *ch, u32 error);
 bool nvgpu_is_error_notifier_set(struct channel_gk20a *ch, u32 error_notifier);
 
-#endif /* __NVGPU_ERROR_NOTIFIER_H__ */
+#endif /* NVGPU_ERROR_NOTIFIER_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/firmware.h b/drivers/gpu/nvgpu/include/nvgpu/firmware.h
index cde897ed..54d67956 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/firmware.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/firmware.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_FIRMWARE_H_
-#define _NVGPU_FIRMWARE_H_
+#ifndef NVGPU_FIRMWARE_H
+#define NVGPU_FIRMWARE_H
 
 #include <nvgpu/types.h>
 
@@ -71,4 +71,4 @@ struct nvgpu_firmware *nvgpu_request_firmware(struct gk20a *g,
  */
 void nvgpu_release_firmware(struct gk20a *g, struct nvgpu_firmware *fw);
 
-#endif
+#endif /* NVGPU_FIRMWARE_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/fuse.h b/drivers/gpu/nvgpu/include/nvgpu/fuse.h
index fb04eef1..1d459a91 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/fuse.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/fuse.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_FUSE_H__
-#define __NVGPU_FUSE_H__
+#ifndef NVGPU_FUSE_H
+#define NVGPU_FUSE_H
 
 struct gk20a;
 
@@ -35,4 +35,4 @@ void nvgpu_tegra_fuse_write_opt_gpu_tpc1_disable(struct gk20a *g, u32 val);
 int nvgpu_tegra_fuse_read_gcplex_config_fuse(struct gk20a *g, u32 *val);
 int nvgpu_tegra_fuse_read_reserved_calib(struct gk20a *g, u32 *val);
 
-#endif
+#endif /* NVGPU_FUSE_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/io.h b/drivers/gpu/nvgpu/include/nvgpu/io.h
index fb7783fe..d6cc16e8 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/io.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/io.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_IO_H__
-#define __NVGPU_IO_H__
+#ifndef NVGPU_IO_H
+#define NVGPU_IO_H
 
 #include <nvgpu/types.h>
 
@@ -46,4 +46,4 @@ u32 nvgpu_bar1_readl(struct gk20a *g, u32 b);
 bool nvgpu_io_exists(struct gk20a *g);
 bool nvgpu_io_valid_reg(struct gk20a *g, u32 r);
 
-#endif
+#endif /* NVGPU_IO_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/io_usermode.h b/drivers/gpu/nvgpu/include/nvgpu/io_usermode.h
index a756ef44..f56062ba 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/io_usermode.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/io_usermode.h
@@ -19,9 +19,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#ifndef __NVGPU_IO_USERMODE_H__
-#define __NVGPU_IO_USERMODE_H__
+#ifndef NVGPU_IO_USERMODE_H
+#define NVGPU_IO_USERMODE_H
 
 void nvgpu_usermode_writel(struct gk20a *g, u32 r, u32 v);
 
-#endif
+#endif /* NVGPU_IO_USERMODE_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/log2.h b/drivers/gpu/nvgpu/include/nvgpu/log2.h
index 57b77217..98db1ecc 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/log2.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/log2.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_LOG2_H__
-#define __NVGPU_LOG2_H__
+#ifndef NVGPU_LOG2_H
+#define NVGPU_LOG2_H
 
 #ifdef __KERNEL__
 #include <linux/log2.h>
@@ -28,4 +28,4 @@
 #include <nvgpu/posix/log2.h>
 #endif
 
-#endif /* __NVGPU_LOG2_H__ */
+#endif /* NVGPU_LOG2_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/ltc.h b/drivers/gpu/nvgpu/include/nvgpu/ltc.h
index 21edcba7..a674a291 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/ltc.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/ltc.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_LTC_H__
-#define __NVGPU_LTC_H__
+#ifndef NVGPU_LTC_H
+#define NVGPU_LTC_H
 
 #include <nvgpu/types.h>
 
@@ -32,4 +32,4 @@ void nvgpu_ltc_sync_enabled(struct gk20a *g);
 int nvgpu_ltc_alloc_cbc(struct gk20a *g, size_t compbit_backing_size,
                         bool vidmem_alloc);
 
-#endif
+#endif /* NVGPU_LTC_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvhost.h b/drivers/gpu/nvgpu/include/nvgpu/nvhost.h
index 7d50d222..74dc48b5 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/nvhost.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/nvhost.h
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __NVGPU_NVHOST_H__
-#define __NVGPU_NVHOST_H__
+#ifndef NVGPU_NVHOST_H
+#define NVGPU_NVHOST_H
 
 #ifdef CONFIG_TEGRA_GK20A_NVHOST
 
@@ -109,4 +109,4 @@ static inline int nvgpu_nvhost_syncpt_init(struct gk20a *g)
 }
 #endif
 #endif /* CONFIG_TEGRA_GK20A_NVHOST */
-#endif /* __NVGPU_NVHOST_H__ */
+#endif /* NVGPU_NVHOST_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/os_fence.h b/drivers/gpu/nvgpu/include/nvgpu/os_fence.h
index fe5d9ced..272b0761 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/os_fence.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/os_fence.h
@@ -22,8 +22,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __NVGPU_OS_FENCE__
-#define __NVGPU_OS_FENCE__
+#ifndef NVGPU_OS_FENCE_H
+#define NVGPU_OS_FENCE_H
 
 #include <nvgpu/errno.h>
 
@@ -135,4 +135,4 @@ static inline int nvgpu_os_fence_syncpt_create(
 
 #endif /* CONFIG_TEGRA_GK20A_NVHOST && CONFIG_SYNC */
 
-#endif /* __NVGPU_OS_FENCE__ */
+#endif /* NVGPU_OS_FENCE_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/os_sched.h b/drivers/gpu/nvgpu/include/nvgpu/os_sched.h
index d1e44b06..c8843b1b 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/os_sched.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/os_sched.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_OS_SCHED_H__
-#define __NVGPU_OS_SCHED_H__
+#ifndef NVGPU_OS_SCHED_H
+#define NVGPU_OS_SCHED_H
 
 #include <nvgpu/log.h>
 
@@ -48,4 +48,4 @@ void __nvgpu_print_current(struct gk20a *g, const char *func_name, int line,
 #define nvgpu_print_current(g, ctx, type) \
         __nvgpu_print_current(g, __func__, __LINE__, ctx, type)
 
-#endif /* __NVGPU_OS_SCHED_H__ */
+#endif /* NVGPU_OS_SCHED_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/pci.h b/drivers/gpu/nvgpu/include/nvgpu/pci.h
index 388e6de8..b38465af 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/pci.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/pci.h
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __NVGPU_PCI_H__
-#define __NVGPU_PCI_H__
+#ifndef NVGPU_PCI_H
+#define NVGPU_PCI_H
 
 #ifdef __KERNEL__
 #include <linux/pci_ids.h>
@@ -36,4 +36,4 @@
 #error "Build bug: need PCI headers!"
 #endif
 
-#endif
+#endif /* NVGPU_PCI_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/soc.h b/drivers/gpu/nvgpu/include/nvgpu/soc.h
index fc7f6341..729d8af4 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/soc.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/soc.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_SOC_H__
-#define __NVGPU_SOC_H__
+#ifndef NVGPU_SOC_H
+#define NVGPU_SOC_H
 
 #include <nvgpu/types.h>
 
@@ -34,4 +34,4 @@ bool nvgpu_is_bpmp_running(struct gk20a *g);
 bool nvgpu_is_soc_t194_a01(struct gk20a *g);
 int nvgpu_init_soc_vars(struct gk20a *g);
 
-#endif
+#endif /* NVGPU_SOC_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/sort.h b/drivers/gpu/nvgpu/include/nvgpu/sort.h
index 20d86680..80bae4b5 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/sort.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/sort.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_SORT_H__
-#define __NVGPU_SORT_H__
+#ifndef NVGPU_SORT_H
+#define NVGPU_SORT_H
 
 #ifdef __KERNEL__
 #include <linux/sort.h>
@@ -30,4 +30,4 @@
 #include <nvgpu_rmos/include/sort.h>
 #endif
 
-#endif
+#endif /* NVGPU_SORT_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/unit.h b/drivers/gpu/nvgpu/include/nvgpu/unit.h
index ea929916..f919392e 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/unit.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/unit.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_UNITS_H__
-#define __NVGPU_UNITS_H__
+#ifndef NVGPU_UNIT_H
+#define NVGPU_UNIT_H
 
 /*
  * Enumeration of all units intended to be used by any HAL that requires
@@ -33,4 +33,4 @@ enum nvgpu_unit {
         NVGPU_UNIT_FIFO,
 };
 
-#endif
+#endif /* NVGPU_UNIT_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/vgpu/vm.h b/drivers/gpu/nvgpu/include/nvgpu/vgpu/vm.h
index 0092fa28..fc0078de 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/vgpu/vm.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/vgpu/vm.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,12 +20,12 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef __NVGPU_VM_VGPU_H__
-#define __NVGPU_VM_VGPU_H__
+#ifndef NVGPU_VGPU_VM_H
+#define NVGPU_VGPU_VM_H
 
 #ifdef CONFIG_TEGRA_GR_VIRTUALIZATION
 int  vgpu_vm_init(struct gk20a *g, struct vm_gk20a *vm);
 void vgpu_vm_remove(struct vm_gk20a *vm);
 #endif
 
-#endif
+#endif /* NVGPU_VGPU_VM_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/vidmem.h b/drivers/gpu/nvgpu/include/nvgpu/vidmem.h
index 4809bcd4..4470232d 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/vidmem.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/vidmem.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_VIDMEM_H__
-#define __NVGPU_VIDMEM_H__
+#ifndef NVGPU_VIDMEM_H
+#define NVGPU_VIDMEM_H
 
 #include <nvgpu/types.h>
 #include <nvgpu/errno.h>
@@ -145,4 +145,4 @@ static inline void nvgpu_vidmem_thread_unpause(struct mm_gk20a *mm)
 #define vidmem_dbg(g, fmt, args...)                     \
         nvgpu_log(g, gpu_dbg_vidmem, fmt, ##args);      \
 
-#endif /* __NVGPU_VIDMEM_H__ */
+#endif /* NVGPU_VIDMEM_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/vm_area.h b/drivers/gpu/nvgpu/include/nvgpu/vm_area.h
index 53e1cb85..8778e424 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/vm_area.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/vm_area.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_VM_AREA_H__
-#define __NVGPU_VM_AREA_H__
+#ifndef NVGPU_VM_AREA_H
+#define NVGPU_VM_AREA_H
 
 #include <nvgpu/list.h>
 #include <nvgpu/types.h>
@@ -72,4 +72,4 @@ int nvgpu_vm_area_validate_buffer(struct vm_gk20a *vm,
                                   u64 map_offset, u64 map_size, u32 pgsz_idx,
                                   struct nvgpu_vm_area **pvm_area);
 
-#endif
+#endif /* NVGPU_VM_AREA_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/xve.h b/drivers/gpu/nvgpu/include/nvgpu/xve.h
index 1c47e1c5..acaf441c 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/xve.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/xve.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_XVE_H__
-#define __NVGPU_XVE_H__
+#ifndef NVGPU_XVE_H
+#define NVGPU_XVE_H
 
 #include <nvgpu/types.h>
 #include <nvgpu/log2.h>
@@ -64,4 +64,4 @@ static inline const char *xve_speed_to_str(u32 speed)
                "Unknown ???";
 }
 
-#endif
+#endif /* NVGPU_XVE_H */