1 files changed, 12 insertions, 11 deletions

diff --git a/drivers/gpu/host1x/hw/cdma_hw.c b/drivers/gpu/host1x/hw/cdma_hw.c
index 305ea8f3382d..659c1bbfeeba 100644
--- a/drivers/gpu/host1x/hw/cdma_hw.c
+++ b/drivers/gpu/host1x/hw/cdma_hw.c
@@ -41,7 +41,7 @@ static void cdma_timeout_cpu_incr(struct host1x_cdma *cdma, u32 getptr,
 {
         struct host1x *host1x = cdma_to_host1x(cdma);
         struct push_buffer *pb = &cdma->push_buffer;
-        u32 i;
+        unsigned int i;
 
         for (i = 0; i < syncpt_incrs; i++)
                 host1x_syncpt_incr(cdma->timeout.syncpt);
@@ -58,6 +58,7 @@ static void cdma_timeout_cpu_incr(struct host1x_cdma *cdma, u32 getptr,
                         &pb->phys, getptr);
                 getptr = (getptr + 8) & (pb->size_bytes - 1);
         }
+
         wmb();
 }
 
@@ -162,12 +163,14 @@ static void cdma_stop(struct host1x_cdma *cdma)
         struct host1x_channel *ch = cdma_to_channel(cdma);
 
         mutex_lock(&cdma->lock);
+
         if (cdma->running) {
                 host1x_cdma_wait_locked(cdma, CDMA_EVENT_SYNC_QUEUE_EMPTY);
                 host1x_ch_writel(ch, HOST1X_CHANNEL_DMACTRL_DMASTOP,
                                  HOST1X_CHANNEL_DMACTRL);
                 cdma->running = false;
         }
+
         mutex_unlock(&cdma->lock);
 }
 
@@ -213,11 +216,11 @@ static void cdma_resume(struct host1x_cdma *cdma, u32 getptr)
         u32 cmdproc_stop;
 
         dev_dbg(host1x->dev,
-                "resuming channel (id %d, DMAGET restart = 0x%x)\n",
+                "resuming channel (id %u, DMAGET restart = 0x%x)\n",
                 ch->id, getptr);
 
         cmdproc_stop = host1x_sync_readl(host1x, HOST1X_SYNC_CMDPROC_STOP);
-        cmdproc_stop &= ~(BIT(ch->id));
+        cmdproc_stop &= ~BIT(ch->id);
         host1x_sync_writel(host1x, cmdproc_stop, HOST1X_SYNC_CMDPROC_STOP);
 
         cdma->torndown = false;
@@ -231,14 +234,11 @@ static void cdma_resume(struct host1x_cdma *cdma, u32 getptr)
  */
 static void cdma_timeout_handler(struct work_struct *work)
 {
+        u32 prev_cmdproc, cmdproc_stop, syncpt_val;
         struct host1x_cdma *cdma;
         struct host1x *host1x;
         struct host1x_channel *ch;
 
-        u32 syncpt_val;
-
-        u32 prev_cmdproc, cmdproc_stop;
-
         cdma = container_of(to_delayed_work(work), struct host1x_cdma,
                             timeout.wq);
         host1x = cdma_to_host1x(cdma);
@@ -277,9 +277,9 @@ static void cdma_timeout_handler(struct work_struct *work)
                 return;
         }
 
-        dev_warn(host1x->dev, "%s: timeout: %d (%s), HW thresh %d, done %d\n",
-                __func__, cdma->timeout.syncpt->id, cdma->timeout.syncpt->name,
-                syncpt_val, cdma->timeout.syncpt_val);
+        dev_warn(host1x->dev, "%s: timeout: %u (%s), HW thresh %d, done %d\n",
+                 __func__, cdma->timeout.syncpt->id, cdma->timeout.syncpt->name,
+                 syncpt_val, cdma->timeout.syncpt_val);
 
         /* stop HW, resetting channel/module */
         host1x_hw_cdma_freeze(host1x, cdma);
@@ -291,7 +291,7 @@ static void cdma_timeout_handler(struct work_struct *work)
 /*
  * Init timeout resources
  */
-static int cdma_timeout_init(struct host1x_cdma *cdma, u32 syncpt_id)
+static int cdma_timeout_init(struct host1x_cdma *cdma, unsigned int syncpt)
 {
         INIT_DELAYED_WORK(&cdma->timeout.wq, cdma_timeout_handler);
         cdma->timeout.initialized = true;
@@ -306,6 +306,7 @@ static void cdma_timeout_destroy(struct host1x_cdma *cdma)
 {
         if (cdma->timeout.initialized)
                 cancel_delayed_work(&cdma->timeout.wq);
+
         cdma->timeout.initialized = false;
 }