From 673dd971600b26131c0afdb221e13c080da022fd Mon Sep 17 00:00:00 2001 From: Mahantesh Kumbar Date: Wed, 10 May 2017 20:35:24 +0530 Subject: gpu: nvgpu: moved & renamed "struct pmu_gk20a" - Renamed "struct pmu_gk20a" to "struct nvgpu_pmu" then moved to file "pmu.h" under folder "drivers/gpu/nvgpu/include/nvgpu/" - Included header file "pmu.h" to dependent file & removed "pmu_gk20a.h" include if its usage is not present. - Replaced "struct pmu_gk20a" with "struct nvgpu_pmu" in dependent source & header files. JIRA NVGPU-56 Change-Id: Ia3c606616831027093d5c216959c6a40d7c2632e Signed-off-by: Mahantesh Kumbar Reviewed-on: http://git-master/r/1479209 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/boardobj/boardobj.h | 6 +++--- drivers/gpu/nvgpu/boardobj/boardobjgrp.c | 6 ++---- drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h | 1 - drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h | 1 - 4 files changed, 5 insertions(+), 9 deletions(-) (limited to 'drivers/gpu/nvgpu/boardobj') diff --git a/drivers/gpu/nvgpu/boardobj/boardobj.h b/drivers/gpu/nvgpu/boardobj/boardobj.h index a445a2c6..f2ae52e6 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobj.h +++ b/drivers/gpu/nvgpu/boardobj/boardobj.h @@ -14,11 +14,11 @@ #ifndef _BOARDOBJ_H_ #define _BOARDOBJ_H_ -struct boardobj; +#include -#include "gk20a/pmu_gk20a.h" #include "ctrl/ctrlboardobj.h" -#include + +struct boardobj; /* * check whether the specified BOARDOBJ object implements the queried diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp.c b/drivers/gpu/nvgpu/boardobj/boardobjgrp.c index d2fb8a45..51c23589 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp.c +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp.c @@ -1,5 +1,5 @@ /* -* Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. +* Copyright (c) 2016-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, @@ -10,15 +10,13 @@ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * more details. */ +#include #include "gk20a/gk20a.h" -#include "gk20a/pmu_gk20a.h" #include "boardobjgrp.h" #include "ctrl/ctrlboardobj.h" #include "boardobj.h" -#include - static boardobjgrp_objinsert boardobjgrp_objinsert_final; static boardobjgrp_objgetbyidx boardobjgrp_objgetbyidx_final; static boardobjgrp_objgetnext boardobjgrp_objgetnext_final; diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h index 059b224d..93e9d4b0 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h @@ -14,7 +14,6 @@ #ifndef _BOARDOBJGRP_E255_H_ #define _BOARDOBJGRP_E255_H_ -#include "gk20a/pmu_gk20a.h" #include "ctrl/ctrlboardobj.h" #include "boardobj.h" #include "boardobjgrpmask.h" diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h index fb114024..62498f79 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h @@ -14,7 +14,6 @@ #ifndef _BOARDOBJGRP_E32_H_ #define _BOARDOBJGRP_E32_H_ -#include "gk20a/pmu_gk20a.h" #include "ctrl/ctrlboardobj.h" #include "boardobj.h" #include "boardobjgrp.h" -- cgit v1.2.2