From ab4aa0afba44612ae5881d9da26b987767992c71 Mon Sep 17 00:00:00 2001 From: Antony Clince Alex Date: Thu, 29 Jul 2021 15:13:04 +0000 Subject: [PATCH] gpu: nvgpu: remove incorrect usage of CONFIG_NVGPU_NEXT Remove incorrect usage of CONFIG_NVGPU_NEXT introuduced in patch: https://git-master.nvidia.com/r/#/c/linux-nvgpu/+/2499571/ JIRA NVGPU-6574 Change-Id: I9bf0f0ee5d9762b79dd7913402678b0dd87f21ee Signed-off-by: Antony Clince Alex Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2567353 Tested-by: mobile promotions Reviewed-by: mobile promotions --- drivers/gpu/nvgpu/include/nvgpu/gk20a.h | 4 ---- drivers/gpu/nvgpu/os/linux/driver_common.c | 3 --- drivers/gpu/nvgpu/os/linux/sysfs.c | 4 ---- 3 files changed, 11 deletions(-) diff --git a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h index b589e948b..59b2f6650 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h @@ -153,10 +153,6 @@ enum nvgpu_profiler_pm_reservation_scope; #include -#if defined(CONFIG_NVGPU_NEXT) -#include "nvgpu_next_dt_bindings.h" -#endif - #include "hal/clk/clk_gk20a.h" /** diff --git a/drivers/gpu/nvgpu/os/linux/driver_common.c b/drivers/gpu/nvgpu/os/linux/driver_common.c index 5861e3969..c668f3d41 100644 --- a/drivers/gpu/nvgpu/os/linux/driver_common.c +++ b/drivers/gpu/nvgpu/os/linux/driver_common.c @@ -41,9 +41,6 @@ #include "os_linux.h" #include "sysfs.h" #include "ioctl.h" -#if defined(CONFIG_NVGPU_NEXT) -#include "nvgpu_next_dt_bindings.h" -#endif #define EMC3D_DEFAULT_RATIO 750 diff --git a/drivers/gpu/nvgpu/os/linux/sysfs.c b/drivers/gpu/nvgpu/os/linux/sysfs.c index 5a598e5e3..392f64a89 100644 --- a/drivers/gpu/nvgpu/os/linux/sysfs.c +++ b/drivers/gpu/nvgpu/os/linux/sysfs.c @@ -50,10 +50,6 @@ #include #endif -#if defined(CONFIG_NVGPU_NEXT) -#include "nvgpu_next_dt_bindings.h" -#endif - #define PTIMER_FP_FACTOR 1000000 #define ROOTRW (S_IRWXU|S_IRGRP|S_IROTH)