nvgpu: clk: 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 clk 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: I5305066dffcfb03e3c99fb501e783dcc70765b11
Signed-off-by: smadhavan <smadhavan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1809069
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-by: Adeel Raza <araza@nvidia.com>
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>

8 files changed, 24 insertions, 24 deletions

diff --git a/drivers/gpu/nvgpu/clk/clk.h b/drivers/gpu/nvgpu/clk/clk.h
index 0a0d9c98..5a6aeae3 100644
--- a/drivers/gpu/nvgpu/clk/clk.h
+++ b/drivers/gpu/nvgpu/clk/clk.h
@@ -21,8 +21,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#ifndef _CLK_H_
-#define _CLK_H_
+#ifndef NVGPU_CLK_H
+#define NVGPU_CLK_H
 
 #include "clk_vin.h"
 #include "clk_fll.h"
@@ -140,4 +140,4 @@ u32 nvgpu_clk_vf_change_inject_data_fill_gp10x(struct gk20a *g,
 u32 nvgpu_clk_set_boot_fll_clk_gv10x(struct gk20a *g);
 int clk_pmu_freq_effective_avg_load(struct gk20a *g, bool bload);
 u32 clk_freq_effective_avg(struct gk20a *g, u32  clkDomainMask);
-#endif
+#endif /* NVGPU_CLK_H */
diff --git a/drivers/gpu/nvgpu/clk/clk_domain.h b/drivers/gpu/nvgpu/clk/clk_domain.h
index a8ae0d48..e5a7153e 100644
--- a/drivers/gpu/nvgpu/clk/clk_domain.h
+++ b/drivers/gpu/nvgpu/clk/clk_domain.h
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
 */
 
-#ifndef _CLKDOMAIN_H_
-#define _CLKDOMAIN_H_
+#ifndef NVGPU_CLK_DOMAIN_H
+#define NVGPU_CLK_DOMAIN_H
 
 #include "ctrl/ctrlclk.h"
 #include "ctrl/ctrlboardobj.h"
@@ -154,4 +154,4 @@ int clk_domain_clk_prog_link(struct gk20a *g, struct clk_pmupstate *pclk);
         ((struct clk_domain *)BOARDOBJGRP_OBJ_GET_BY_IDX(               \
                 &pclk->clk_domainobjs.super.super, (u8)(idx)))
 
-#endif
+#endif /* NVGPU_CLK_DOMAIN_H */
diff --git a/drivers/gpu/nvgpu/clk/clk_fll.h b/drivers/gpu/nvgpu/clk/clk_fll.h
index 7f7cad97..6cbdfe2e 100644
--- a/drivers/gpu/nvgpu/clk/clk_fll.h
+++ b/drivers/gpu/nvgpu/clk/clk_fll.h
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
 */
 
-#ifndef _CLKFLL_H_
-#define _CLKFLL_H_
+#ifndef NVGPU_CLK_FLL_H
+#define NVGPU_CLK_FLL_H
 
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
 #include "boardobj/boardobjgrp_e32.h"
@@ -78,4 +78,4 @@ u32 nvgpu_clk_get_vbios_clk_domain_gp10x( u32 vbios_domain);
 #define CLK_FLL_LUT_STEP_SIZE_UV(pclk) \
         (pclk->avfs_fllobjs.lut_step_size_uv)
 
-#endif
+#endif /* NVGPU_CLK_FLL_H */
diff --git a/drivers/gpu/nvgpu/clk/clk_freq_controller.h b/drivers/gpu/nvgpu/clk/clk_freq_controller.h
index 659b75d5..7ae475c1 100644
--- a/drivers/gpu/nvgpu/clk/clk_freq_controller.h
+++ b/drivers/gpu/nvgpu/clk/clk_freq_controller.h
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
 */
 
-#ifndef _CLK_FREQ_CONTROLLER_H_
-#define _CLK_FREQ_CONTROLLER_H_
+#ifndef NVGPU_CLK_FREQ_CONTROLLER_H
+#define NVGPU_CLK_FREQ_CONTROLLER_H
 
 #define CTRL_CLK_CLK_FREQ_CONTROLLER_ID_ALL  0xFF
 #define CTRL_CLK_CLK_FREQ_CONTROLLER_ID_SYS  0x00
@@ -81,4 +81,4 @@ struct clk_freq_controllers {
 int clk_freq_controller_sw_setup(struct gk20a *g);
 int clk_freq_controller_pmu_setup(struct gk20a *g);
 
-#endif
+#endif /* NVGPU_CLK_FREQ_CONTROLLER_H */
diff --git a/drivers/gpu/nvgpu/clk/clk_mclk.h b/drivers/gpu/nvgpu/clk/clk_mclk.h
index 00356c98..47c81d11 100644
--- a/drivers/gpu/nvgpu/clk/clk_mclk.h
+++ b/drivers/gpu/nvgpu/clk/clk_mclk.h
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
 */
 
-#ifndef _CLKMCLK_H_
-#define _CLKMCLK_H_
+#ifndef NVGPU_CLK_MCLK_H
+#define NVGPU_CLK_MCLK_H
 
 #include <nvgpu/lock.h>
 
@@ -57,4 +57,4 @@ struct clk_mclk_state {
 #endif
 };
 
-#endif
+#endif /* NVGPU_CLK_MCLK_H */
diff --git a/drivers/gpu/nvgpu/clk/clk_prog.h b/drivers/gpu/nvgpu/clk/clk_prog.h
index cabe0bf0..af6368fd 100644
--- a/drivers/gpu/nvgpu/clk/clk_prog.h
+++ b/drivers/gpu/nvgpu/clk/clk_prog.h
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
 */
 
-#ifndef _CLKPROG_H_
-#define _CLKPROG_H_
+#ifndef NVGPU_CLK_PROG_H
+#define NVGPU_CLK_PROG_H
 #include "ctrl/ctrlclk.h"
 #include "ctrl/ctrlboardobj.h"
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
@@ -97,4 +97,4 @@ struct clk_prog_1x_master_table {
         ((struct clk_prog *)BOARDOBJGRP_OBJ_GET_BY_IDX(                 \
                 &pclk->clk_progobjs.super.super, (u8)(idx)))
 
-#endif
+#endif /* NVGPU_CLK_PROG_H */
diff --git a/drivers/gpu/nvgpu/clk/clk_vf_point.h b/drivers/gpu/nvgpu/clk/clk_vf_point.h
index a4e2f48f..b72fe64c 100644
--- a/drivers/gpu/nvgpu/clk/clk_vf_point.h
+++ b/drivers/gpu/nvgpu/clk/clk_vf_point.h
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
 */
 
-#ifndef _CLKVFPOINT_H_
-#define _CLKVFPOINT_H_
+#ifndef NVGPU_CLK_VF_POINT_H
+#define NVGPU_CLK_VF_POINT_H
 #include "ctrl/ctrlclk.h"
 #include "ctrl/ctrlboardobj.h"
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
@@ -80,4 +80,4 @@ struct clk_vf_point_freq {
 
 struct clk_vf_point *construct_clk_vf_point(struct gk20a *g, void *pargs);
 
-#endif
+#endif /* NVGPU_CLK_VF_POINT_H */
diff --git a/drivers/gpu/nvgpu/clk/clk_vin.h b/drivers/gpu/nvgpu/clk/clk_vin.h
index 9396c848..73b93e40 100644
--- a/drivers/gpu/nvgpu/clk/clk_vin.h
+++ b/drivers/gpu/nvgpu/clk/clk_vin.h
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
 */
 
-#ifndef _CLKVIN_H_
-#define _CLKVIN_H_
+#ifndef NVGPU_CLK_VIN_H
+#define NVGPU_CLK_VIN_H
 
 #include "boardobj/boardobj.h"
 #include "boardobj/boardobjgrp.h"
@@ -76,4 +76,4 @@ u32 clk_avfs_get_vin_cal_fuse_v20(struct gk20a *g,
                                         struct avfsvinobjs *pvinobjs,
                                         struct vin_device_v20 *pvindev);
 
-#endif
+#endif /* NVGPU_CLK_VIN_H */