2 files changed, 7 insertions, 6 deletions

diff --git a/drivers/gpu/nvgpu/vgpu/dbg_vgpu.c b/drivers/gpu/nvgpu/vgpu/dbg_vgpu.c
index c312c419..609b497a 100644
--- a/drivers/gpu/nvgpu/vgpu/dbg_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/dbg_vgpu.c
@@ -30,9 +30,9 @@ static int vgpu_exec_regops(struct dbg_session_gk20a *dbg_s,
         struct tegra_vgpu_cmd_msg msg;
         struct tegra_vgpu_reg_ops_params *p = &msg.params.reg_ops;
         void *oob;
-        size_t oob_size;
+        size_t oob_size, ops_size;
         void *handle = NULL;
-        int ops_size, err = 0;
+        int err = 0;
 
         gk20a_dbg_fn("");
         BUG_ON(sizeof(*ops) != sizeof(struct tegra_vgpu_reg_op));
diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
index efeeb8ee..c3669990 100644
--- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
@@ -184,7 +184,7 @@ static int init_runlist(struct gk20a *g, struct fifo_gk20a *f)
 {
         struct fifo_runlist_info_gk20a *runlist;
         struct device *d = dev_from_gk20a(g);
-        s32 runlist_id = -1;
+        unsigned int runlist_id = -1;
         u32 i;
         u64 runlist_size;
 
@@ -238,7 +238,8 @@ static int vgpu_init_fifo_setup_sw(struct gk20a *g)
         struct fifo_gk20a *f = &g->fifo;
         struct device *d = dev_from_gk20a(g);
         struct vgpu_priv_data *priv = vgpu_get_priv_data(g);
-        int chid, err = 0;
+        unsigned int chid;
+        int err = 0;
 
         gk20a_dbg_fn("");
 
@@ -486,7 +487,7 @@ static int vgpu_fifo_update_runlist_locked(struct gk20a *g, u32 runlist_id,
 
         /* valid channel, add/remove it from active list.
            Otherwise, keep active list untouched for suspend/resume. */
-        if (hw_chid != ~0) {
+        if (hw_chid != (u32)~0) {
                 if (add) {
                         if (test_and_set_bit(hw_chid,
                                 runlist->active_channels) == 1)
@@ -498,7 +499,7 @@ static int vgpu_fifo_update_runlist_locked(struct gk20a *g, u32 runlist_id,
                 }
         }
 
-        if (hw_chid != ~0 || /* add/remove a valid channel */
+        if (hw_chid != (u32)~0 || /* add/remove a valid channel */
             add /* resume to add all channels back */) {
                 u32 chid;