3 files changed, 1 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 73b49927..bc8d3ea8 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -47,8 +47,6 @@
 #include "regops_gk20a.h"
 #include "dbg_gpu_gk20a.h"
 
-#include "common/linux/os_linux.h"
-
 #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h>
 #include <nvgpu/hw/gk20a/hw_ctxsw_prog_gk20a.h>
 #include <nvgpu/hw/gk20a/hw_fifo_gk20a.h>
@@ -6491,7 +6489,7 @@ int gr_gk20a_get_pm_ctx_buffer_offsets(struct gk20a *g,
                 return -ENODEV;
 
         priv_registers = nvgpu_kzalloc(g, sizeof(u32) * potential_offsets);
-        if (ZERO_OR_NULL_PTR(priv_registers)) {
+        if (!priv_registers) {
                 gk20a_dbg_fn("failed alloc for potential_offsets=%d", potential_offsets);
                 return -ENOMEM;
         }
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index d7afcea2..3341721c 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -30,7 +30,6 @@
 
 #include "gk20a/gk20a.h"
 #include "gk20a/gr_gk20a.h"
-#include "common/linux/os_linux.h"
 
 #include "gr_gm20b.h"
 #include "pmu_gm20b.h"
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
index c232c4ab..578432e5 100644
--- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
@@ -35,7 +35,6 @@
 #include "gk20a/gr_gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
 #include "gk20a/regops_gk20a.h"
-#include "common/linux/os_linux.h"
 
 #include "gm20b/gr_gm20b.h"
 #include "gp10b/gr_gp10b.h"