gpu: nvgpu: Fix more pmu circular dependencies

Similar to patch 67fc4629892ab60d6335752b93d883ef690f1ea4 fix
more circular dependencies arising from #include'ing gk20a.h
for no apparent reason.

Bug 200192125

Coverity ID 2011397
Coverity ID 2011398

Change-Id: I75bcb3e4e66b680498b0e20d645ab9543aae6697
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1296947
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

5 files changed, 2 insertions, 9 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index bd9d4f2b..0a2d36fe 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -26,6 +26,7 @@
 
 #include <nvgpu/timers.h>
 
+#include "gk20a.h"
 #include "gr_gk20a.h"
 #include "semaphore_gk20a.h"
 #include "nvgpu_common.h"
diff --git a/drivers/gpu/nvgpu/pmuif/gpmuifclk.h b/drivers/gpu/nvgpu/pmuif/gpmuifclk.h
index 70f26707..0af94eaa 100644
--- a/drivers/gpu/nvgpu/pmuif/gpmuifclk.h
+++ b/drivers/gpu/nvgpu/pmuif/gpmuifclk.h
@@ -14,8 +14,6 @@
 #ifndef _GPMUIFCLK_H_
 #define _GPMUIFCLK_H_
 
-#include "gk20a/gk20a.h"
-#include "gk20a/pmu_gk20a.h"
 #include "ctrl/ctrlboardobj.h"
 #include "ctrl/ctrlvolt.h"
 #include "ctrl/ctrlperf.h"
diff --git a/drivers/gpu/nvgpu/pmuif/gpmuifpmgr.h b/drivers/gpu/nvgpu/pmuif/gpmuifpmgr.h
index b985b015..89cc27d1 100644
--- a/drivers/gpu/nvgpu/pmuif/gpmuifpmgr.h
+++ b/drivers/gpu/nvgpu/pmuif/gpmuifpmgr.h
@@ -14,8 +14,7 @@
 #ifndef _GPMUIFPMGR_H_
 #define _GPMUIFPMGR_H_
 
-#include "gk20a/gk20a.h"
-#include "gk20a/pmu_gk20a.h"
+#include "gk20a/pmu_common.h"
 #include "ctrl/ctrlpmgr.h"
 #include "pmuif/gpmuifboardobj.h"
 #include "gk20a/pmu_common.h"
diff --git a/drivers/gpu/nvgpu/pmuif/gpmuifthermsensor.h b/drivers/gpu/nvgpu/pmuif/gpmuifthermsensor.h
index 498661b3..f0f1340e 100644
--- a/drivers/gpu/nvgpu/pmuif/gpmuifthermsensor.h
+++ b/drivers/gpu/nvgpu/pmuif/gpmuifthermsensor.h
@@ -14,8 +14,6 @@
 #ifndef _GPMUIFTHERMSENSOR_H_
 #define _GPMUIFTHERMSENSOR_H_
 
-#include "gk20a/gk20a.h"
-#include "gk20a/pmu_gk20a.h"
 #include "ctrl/ctrltherm.h"
 #include "pmuif/gpmuifboardobj.h"
 #include "gk20a/pmu_common.h"
@@ -74,4 +72,3 @@ union nv_pmu_therm_therm_channel_boardobj_set_union {
 NV_PMU_BOARDOBJ_GRP_SET_MAKE_E32(therm, therm_channel);
 
 #endif
-
diff --git a/drivers/gpu/nvgpu/pmuif/gpmuifvolt.h b/drivers/gpu/nvgpu/pmuif/gpmuifvolt.h
index fbce6031..359b3a7a 100644
--- a/drivers/gpu/nvgpu/pmuif/gpmuifvolt.h
+++ b/drivers/gpu/nvgpu/pmuif/gpmuifvolt.h
@@ -13,8 +13,6 @@
 #ifndef _GPMUIFVOLT_H_
 #define _GPMUIFVOLT_H_
 
-#include "gk20a/gk20a.h"
-#include "gk20a/pmu_gk20a.h"
 #include "pmuif/gpmuifboardobj.h"
 #include "gk20a/pmu_common.h"
 #include "ctrl/ctrlvolt.h"