From 7665421874e66f0b00d52a5f1db5210895a9ab7b Mon Sep 17 00:00:00 2001
From: Terje Bergstrom <tbergstrom@nvidia.com>
Date: Tue, 11 Apr 2017 11:39:21 -0700
Subject: gpu: nvgpu: Replace use of bitops.h and kernel.h

Remove use of linux/kernel.h and linux/compiler.h. We don't use
anything in those headers.

Also replace use of linux/bitops.h with new wrapper nvgpu/bitops.h.

JIRA NVGPU-13

Change-Id: Iefa6b4598d5a5e7fc386c0a7a554e778a87010d6
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1460777
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
---
 drivers/gpu/nvgpu/gk20a/bus_gk20a.h    | 2 ++
 drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c | 2 +-
 drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c  | 1 -
 drivers/gpu/nvgpu/gk20a/hal.h          | 2 --
 drivers/gpu/nvgpu/gk20a/hal_gk20a.h    | 2 --
 drivers/gpu/nvgpu/gk20a/kind_gk20a.c   | 6 +-----
 drivers/gpu/nvgpu/gk20a/kind_gk20a.h   | 1 +
 drivers/gpu/nvgpu/gk20a/ltc_gk20a.c    | 2 --
 drivers/gpu/nvgpu/gk20a/sync_gk20a.c   | 1 -
 9 files changed, 5 insertions(+), 14 deletions(-)

(limited to 'drivers/gpu/nvgpu/gk20a')

diff --git a/drivers/gpu/nvgpu/gk20a/bus_gk20a.h b/drivers/gpu/nvgpu/gk20a/bus_gk20a.h
index b2f8f8c9..72710c35 100644
--- a/drivers/gpu/nvgpu/gk20a/bus_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/bus_gk20a.h
@@ -16,6 +16,8 @@
 #ifndef BUS_GK20A_H
 #define BUS_GK20A_H
 
+#include <nvgpu/types.h>
+
 struct gk20a;
 struct gpu_ops;
 struct nvgpu_mem;
diff --git a/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c
index 76237e03..48a60f5d 100644
--- a/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <linux/bitops.h>
 #include <linux/dma-mapping.h>
 #include <linux/dma-buf.h>
 
+#include <nvgpu/bitops.h>
 #include <nvgpu/kmem.h>
 #include <nvgpu/lock.h>
 #include <nvgpu/dma.h>
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c b/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c
index 4b3bb83c..4d5854d4 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c
@@ -21,7 +21,6 @@
 #include <linux/version.h>
 #include <linux/device.h>
 #include <linux/pm_runtime.h>
-#include <linux/kernel.h>
 #include <linux/fb.h>
 #include <linux/gk20a.h>
 #include <linux/clk/tegra.h>
diff --git a/drivers/gpu/nvgpu/gk20a/hal.h b/drivers/gpu/nvgpu/gk20a/hal.h
index da02cf5f..4203dbfa 100644
--- a/drivers/gpu/nvgpu/gk20a/hal.h
+++ b/drivers/gpu/nvgpu/gk20a/hal.h
@@ -16,8 +16,6 @@
 #ifndef __HAL_GPU__
 #define __HAL_GPU__
 
-#include <linux/kernel.h>
-
 struct gk20a;
 
 int gpu_init_hal(struct gk20a *g);
diff --git a/drivers/gpu/nvgpu/gk20a/hal_gk20a.h b/drivers/gpu/nvgpu/gk20a/hal_gk20a.h
index f214432a..f5475809 100644
--- a/drivers/gpu/nvgpu/gk20a/hal_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/hal_gk20a.h
@@ -18,8 +18,6 @@
 #ifndef __HAL_GK20A__
 #define __HAL_GK20A__
 
-#include <linux/kernel.h>
-
 struct gk20a;
 
 int gk20a_init_hal(struct gk20a *g);
diff --git a/drivers/gpu/nvgpu/gk20a/kind_gk20a.c b/drivers/gpu/nvgpu/gk20a/kind_gk20a.c
index 00e7a54c..4e9ebe4b 100644
--- a/drivers/gpu/nvgpu/gk20a/kind_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/kind_gk20a.c
@@ -1,9 +1,7 @@
 /*
- * drivers/video/tegra/host/gk20a/kind_gk20a.c
- *
  * GK20A memory kind management
  *
- * Copyright (c) 2011-2014, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2011-2017, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -18,8 +16,6 @@
  * this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include <linux/bitops.h>
-#include <linux/compiler.h>
 
 #include "kind_gk20a.h"
 
diff --git a/drivers/gpu/nvgpu/gk20a/kind_gk20a.h b/drivers/gpu/nvgpu/gk20a/kind_gk20a.h
index 93f011d4..9dec84a5 100644
--- a/drivers/gpu/nvgpu/gk20a/kind_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/kind_gk20a.h
@@ -21,6 +21,7 @@
 #ifndef __KIND_GK20A_H__
 #define __KIND_GK20A_H__
 
+#include <nvgpu/bitops.h>
 
 void gk20a_init_uncompressed_kind_map(void);
 void gk20a_init_kind_attr(void);
diff --git a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c
index f8416d55..0d4d62b8 100644
--- a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c
@@ -16,8 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <linux/kernel.h>
-
 #include <trace/events/gk20a.h>
 #include <nvgpu/timers.h>
 #include <nvgpu/log.h>
diff --git a/drivers/gpu/nvgpu/gk20a/sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/sync_gk20a.c
index ecc96a7b..b5619db7 100644
--- a/drivers/gpu/nvgpu/gk20a/sync_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/sync_gk20a.c
@@ -14,7 +14,6 @@
  */
 
 #include <linux/version.h>
-#include <linux/kernel.h>
 #include <linux/file.h>
 #include <linux/fs.h>
 #include <linux/hrtimer.h>
-- 
cgit v1.2.2