gpu: nvgpu: fix return type of *get_litter_value()

All callers for the *get_litter_value() functions were expecting u32,
but the functions were declared to return int's. This is a violation of
MISRA 10.3 which prohibits implicit assignment between essential types
(signed int and unsigned long int, in this case).  The litter values
are all u32's anyway.

JIRA NVGPU-647

Change-Id: I853d2abee372488e5d12e355050cbeaf1e53a42c
Signed-off-by: Philip Elcan <pelcan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1830581
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Scott Long <scottl@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

9 files changed, 14 insertions, 14 deletions

diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index 427403e3..82a510e9 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -71,9 +71,9 @@
 
 #define PRIV_SECURITY_DISABLE 0x01
 
-int gm20b_get_litter_value(struct gk20a *g, int value)
+u32 gm20b_get_litter_value(struct gk20a *g, int value)
 {
-        int ret = EINVAL;
+        u32 ret = EINVAL;
         switch (value) {
         case GPU_LIT_NUM_GPCS:
                 ret = proj_scal_litter_num_gpcs_v();
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.h b/drivers/gpu/nvgpu/gm20b/hal_gm20b.h
index 5deb7ef5..ec6b4e96 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.h
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.h
@@ -27,5 +27,5 @@
 struct gk20a;
 
 int gm20b_init_hal(struct gk20a *g);
-int gm20b_get_litter_value(struct gk20a *g, int value);
+u32 gm20b_get_litter_value(struct gk20a *g, int value);
 #endif /* NVGPU_GM20B_HAL_GM20B_H */
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index c0f2fd57..3786b588 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -106,9 +106,9 @@
 #include <nvgpu/hw/gp106/hw_gr_gp106.h>
 
 
-static int gp106_get_litter_value(struct gk20a *g, int value)
+static u32 gp106_get_litter_value(struct gk20a *g, int value)
 {
-        int ret = -EINVAL;
+        u32 ret = EINVAL;
 
         switch (value) {
         case GPU_LIT_NUM_GPCS:
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
index 68dfcfe4..1050c89f 100644
--- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
@@ -88,9 +88,9 @@
 #include <nvgpu/hw/gp10b/hw_pwr_gp10b.h>
 #include <nvgpu/hw/gp10b/hw_gr_gp10b.h>
 
-int gp10b_get_litter_value(struct gk20a *g, int value)
+u32 gp10b_get_litter_value(struct gk20a *g, int value)
 {
-        int ret = EINVAL;
+        u32 ret = EINVAL;
         switch (value) {
         case GPU_LIT_NUM_GPCS:
                 ret = proj_scal_litter_num_gpcs_v();
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.h b/drivers/gpu/nvgpu/gp10b/hal_gp10b.h
index 6ba80b88..13103c17 100644
--- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.h
+++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.h
@@ -27,5 +27,5 @@
 struct gk20a;
 
 int gp10b_init_hal(struct gk20a *gops);
-int gp10b_get_litter_value(struct gk20a *g, int value);
+u32 gp10b_get_litter_value(struct gk20a *g, int value);
 #endif /* NVGPU_HAL_GP10B_H */
diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c
index 3c3e5742..aecebf79 100644
--- a/drivers/gpu/nvgpu/gv100/hal_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c
@@ -125,9 +125,9 @@
 #include <nvgpu/hw/gv100/hw_pwr_gv100.h>
 #include <nvgpu/hw/gv100/hw_gr_gv100.h>
 
-static int gv100_get_litter_value(struct gk20a *g, int value)
+static u32 gv100_get_litter_value(struct gk20a *g, int value)
 {
-        int ret = EINVAL;
+        u32 ret = EINVAL;
         switch (value) {
         case GPU_LIT_NUM_GPCS:
                 ret = proj_scal_litter_num_gpcs_v();
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
index 986d3b82..0ee0e6c8 100644
--- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
@@ -104,9 +104,9 @@
 #include <nvgpu/hw/gv11b/hw_pwr_gv11b.h>
 #include <nvgpu/hw/gv11b/hw_gr_gv11b.h>
 
-int gv11b_get_litter_value(struct gk20a *g, int value)
+u32 gv11b_get_litter_value(struct gk20a *g, int value)
 {
-        int ret = EINVAL;
+        u32 ret = EINVAL;
         switch (value) {
         case GPU_LIT_NUM_GPCS:
                 ret = proj_scal_litter_num_gpcs_v();
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.h b/drivers/gpu/nvgpu/gv11b/hal_gv11b.h
index d5b7ad01..b10cc727 100644
--- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.h
+++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.h
@@ -27,5 +27,5 @@
 struct gk20a;
 
 int gv11b_init_hal(struct gk20a *gops);
-int gv11b_get_litter_value(struct gk20a *g, int value);
+u32 gv11b_get_litter_value(struct gk20a *g, int value);
 #endif /* NVGPU_HAL_GV11B_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
index a7fe1c2f..2ebe0011 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
@@ -1194,7 +1194,7 @@ struct gpu_ops {
                 int (*perfbuffer_disable)(struct gk20a *g);
         } dbg_session_ops;
 
-        int (*get_litter_value)(struct gk20a *g, int value);
+        u32 (*get_litter_value)(struct gk20a *g, int value);
         int (*chip_init_gpu_characteristics)(struct gk20a *g);
 
         struct {