From 2805f03aa0496502b64ff760f667bfe9d8a27928 Mon Sep 17 00:00:00 2001
From: smadhavan <smadhavan@nvidia.com>
Date: Tue, 11 Sep 2018 10:31:06 +0530
Subject: nvgpu: pmgr: MISRA Rule 21.2 header guard fixes

MISRA rule 21.2 doesn't allow the use of macro names which start with
an underscore. These leading underscores are to be removed from the
macro names. This patch will fix such violations in pmgr by renaming
them to follow the convention, 'NVGPU_PARENT-DIR_HEADER-NAME' when
there is no keyword repetition between file name and directory or
'NVGPU_HEADER-NAME' when there is repetition.

JIRA NVGPU-1028

Change-Id: I1beda400163bfc6278763161520f918fb4a3d096
Signed-off-by: smadhavan <smadhavan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1815663
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 drivers/gpu/nvgpu/pmgr/pmgr.h       | 6 +++---
 drivers/gpu/nvgpu/pmgr/pmgrpmu.h    | 6 +++---
 drivers/gpu/nvgpu/pmgr/pwrdev.h     | 6 +++---
 drivers/gpu/nvgpu/pmgr/pwrmonitor.h | 6 +++---
 drivers/gpu/nvgpu/pmgr/pwrpolicy.h  | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/nvgpu/pmgr/pmgr.h b/drivers/gpu/nvgpu/pmgr/pmgr.h
index 33daf8a9..9b142de0 100644
--- a/drivers/gpu/nvgpu/pmgr/pmgr.h
+++ b/drivers/gpu/nvgpu/pmgr/pmgr.h
@@ -21,8 +21,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#ifndef _PMGR_H_
-#define _PMGR_H_
+#ifndef NVGPU_PMGR_H
+#define NVGPU_PMGR_H
 
 #include "pwrdev.h"
 #include "pwrmonitor.h"
@@ -40,4 +40,4 @@ int pmgr_pwr_devices_get_current(struct gk20a *g, u32 *val);
 int pmgr_pwr_devices_get_voltage(struct gk20a *g, u32 *val);
 int pmgr_pwr_devices_get_power(struct gk20a *g, u32 *val);
 
-#endif
+#endif /* NVGPU_PMGR_H */
diff --git a/drivers/gpu/nvgpu/pmgr/pmgrpmu.h b/drivers/gpu/nvgpu/pmgr/pmgrpmu.h
index 23062b13..f4ffaef3 100644
--- a/drivers/gpu/nvgpu/pmgr/pmgrpmu.h
+++ b/drivers/gpu/nvgpu/pmgr/pmgrpmu.h
@@ -21,8 +21,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#ifndef _PMGRPMU_H_
-#define _PMGRPMU_H_
+#ifndef NVGPU_PMGRPMU_H
+#define NVGPU_PMGRPMU_H
 
 #include <nvgpu/gk20a.h>
 
@@ -36,4 +36,4 @@ u32 pmgr_pmu_pwr_devices_query_blocking(
 		u32 pwr_dev_mask,
 		struct nv_pmu_pmgr_pwr_devices_query_payload *ppayload);
 
-#endif
+#endif /* NVGPU_PMGRPMU_H */
diff --git a/drivers/gpu/nvgpu/pmgr/pwrdev.h b/drivers/gpu/nvgpu/pmgr/pwrdev.h
index 72cca1fb..4bcf65a7 100644
--- a/drivers/gpu/nvgpu/pmgr/pwrdev.h
+++ b/drivers/gpu/nvgpu/pmgr/pwrdev.h
@@ -21,8 +21,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#ifndef _PWRDEV_H_
-#define _PWRDEV_H_
+#ifndef NVGPU_PMGR_PWRDEV_H
+#define NVGPU_PMGR_PWRDEV_H
 
 #include "boardobj/boardobj.h"
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
@@ -57,4 +57,4 @@ struct pwr_device_ina3221 {
 
 int pmgr_device_sw_setup(struct gk20a *g);
 
-#endif
+#endif /* NVGPU_PMGR_PWRDEV_H */
diff --git a/drivers/gpu/nvgpu/pmgr/pwrmonitor.h b/drivers/gpu/nvgpu/pmgr/pwrmonitor.h
index da52b08a..bf4c76f9 100644
--- a/drivers/gpu/nvgpu/pmgr/pwrmonitor.h
+++ b/drivers/gpu/nvgpu/pmgr/pwrmonitor.h
@@ -21,8 +21,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#ifndef _PWRMONITOR_H_
-#define _PWRMONITOR_H_
+#ifndef NVGPU_PMGR_PWRMONITOR_H
+#define NVGPU_PMGR_PWRMONITOR_H
 
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
 #include "boardobj/boardobjgrp.h"
@@ -66,4 +66,4 @@ struct pmgr_pwr_monitor {
 
 int pmgr_monitor_sw_setup(struct gk20a *g);
 
-#endif
+#endif /* NVGPU_PMGR_PWRMONITOR_H */
diff --git a/drivers/gpu/nvgpu/pmgr/pwrpolicy.h b/drivers/gpu/nvgpu/pmgr/pwrpolicy.h
index 12936a3e..868bc2cb 100644
--- a/drivers/gpu/nvgpu/pmgr/pwrpolicy.h
+++ b/drivers/gpu/nvgpu/pmgr/pwrpolicy.h
@@ -21,8 +21,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#ifndef _PWRPOLICY_H_
-#define _PWRPOLICY_H_
+#ifndef NVGPU_PMGR_PWRPOLICY_H
+#define NVGPU_PMGR_PWRPOLICY_H
 
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
 #include "boardobj/boardobjgrp.h"
@@ -133,4 +133,4 @@ union pwr_policy_data_union {
 
 int pmgr_policy_sw_setup(struct gk20a *g);
 
-#endif
+#endif /* NVGPU_PMGR_PWRPOLICY_H */
-- 
cgit v1.2.2