gpu: host1x: Fix a couple of checkpatch warnings

Fix a couple of occurrences where no blank line was used to separate
variable declarations from code or where block comments were wrongly
formatted.

Signed-off-by: Thierry Reding <treding@nvidia.com>

8 files changed, 24 insertions, 8 deletions

diff --git a/drivers/gpu/host1x/cdma.c b/drivers/gpu/host1x/cdma.c
index fe1b216b8d17..b83b0a04d9c5 100644
--- a/drivers/gpu/host1x/cdma.c
+++ b/drivers/gpu/host1x/cdma.c
@@ -247,6 +247,7 @@ static void update_cdma_locked(struct host1x_cdma *cdma)
                 /* Pop push buffer slots */
                 if (job->num_slots) {
                         struct push_buffer *pb = &cdma->push_buffer;
+
                         host1x_pushbuffer_pop(pb, job->num_slots);
                         if (cdma->event == CDMA_EVENT_PUSH_BUFFER_SPACE)
                                 signal = true;
@@ -342,9 +343,11 @@ void host1x_cdma_update_sync_queue(struct host1x_cdma *cdma,
                 syncpt_val += syncpt_incrs;
         }
 
-        /* The following sumbits from the same client may be dependent on the
+        /*
+         * The following sumbits from the same client may be dependent on the
          * failed submit and therefore they may fail. Force a small timeout
-         * to make the queue cleanup faster */
+         * to make the queue cleanup faster.
+         */
 
         list_for_each_entry_from(job, &cdma->sync_queue, list)
                 if (job->client == cdma->timeout.client)
@@ -410,6 +413,7 @@ int host1x_cdma_begin(struct host1x_cdma *cdma, struct host1x_job *job)
                 /* init state on first submit with timeout value */
                 if (!cdma->timeout.initialized) {
                         int err;
+
                         err = host1x_hw_cdma_timeout_init(host1x, cdma,
                                                           job->syncpt_id);
                         if (err) {
diff --git a/drivers/gpu/host1x/debug.c b/drivers/gpu/host1x/debug.c
index 797f8f048117..7bb86b92ff09 100644
--- a/drivers/gpu/host1x/debug.c
+++ b/drivers/gpu/host1x/debug.c
@@ -63,10 +63,12 @@ static int show_channels(struct host1x_channel *ch, void *data, bool show_fifo)
 static void show_syncpts(struct host1x *m, struct output *o)
 {
         unsigned int i;
+
         host1x_debug_output(o, "---- syncpts ----\n");
         for (i = 0; i < host1x_syncpt_nb_pts(m); i++) {
                 u32 max = host1x_syncpt_read_max(m->syncpt + i);
                 u32 min = host1x_syncpt_load(m->syncpt + i);
+
                 if (!min && !max)
                         continue;
 
@@ -76,6 +78,7 @@ static void show_syncpts(struct host1x *m, struct output *o)
 
         for (i = 0; i < host1x_syncpt_nb_bases(m); i++) {
                 u32 base_val;
+
                 base_val = host1x_syncpt_load_wait_base(m->syncpt + i);
                 if (base_val)
                         host1x_debug_output(o, "waitbase id %u val %d\n", i,
diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c
index ff348690df94..320caf99cff4 100644
--- a/drivers/gpu/host1x/dev.c
+++ b/drivers/gpu/host1x/dev.c
@@ -102,7 +102,7 @@ static const struct host1x_info host1x05_info = {
         .dma_mask = DMA_BIT_MASK(34),
 };
 
-static struct of_device_id host1x_of_match[] = {
+static const struct of_device_id host1x_of_match[] = {
         { .compatible = "nvidia,tegra210-host1x", .data = &host1x05_info, },
         { .compatible = "nvidia,tegra124-host1x", .data = &host1x04_info, },
         { .compatible = "nvidia,tegra114-host1x", .data = &host1x02_info, },
diff --git a/drivers/gpu/host1x/hw/debug_hw.c b/drivers/gpu/host1x/hw/debug_hw.c
index 47da9a62ff7e..d2c96dd630ea 100644
--- a/drivers/gpu/host1x/hw/debug_hw.c
+++ b/drivers/gpu/host1x/hw/debug_hw.c
@@ -51,12 +51,11 @@ static unsigned int show_channel_command(struct output *o, u32 val)
                                             val >> 6 & 0x3ff,
                                             val >> 16 & 0xfff, mask);
                         return hweight8(mask);
-                } else {
-                        host1x_debug_output(o, "SETCL(class=%03x)\n",
-                                            val >> 6 & 0x3ff);
-                        return 0;
                 }
 
+                host1x_debug_output(o, "SETCL(class=%03x)\n", val >> 6 & 0x3ff);
+                return 0;
+
         case HOST1X_OPCODE_INCR:
                 host1x_debug_output(o, "INCR(offset=%03x, [",
                                     val >> 16 & 0xfff);
diff --git a/drivers/gpu/host1x/hw/syncpt_hw.c b/drivers/gpu/host1x/hw/syncpt_hw.c
index b60a4b97e4a8..310f24fcd261 100644
--- a/drivers/gpu/host1x/hw/syncpt_hw.c
+++ b/drivers/gpu/host1x/hw/syncpt_hw.c
@@ -38,6 +38,7 @@ static void syncpt_restore(struct host1x_syncpt *sp)
 static void syncpt_restore_wait_base(struct host1x_syncpt *sp)
 {
         struct host1x *host = sp->host;
+
         host1x_sync_writel(host, sp->base_val,
                            HOST1X_SYNC_SYNCPT_BASE(sp->id));
 }
@@ -48,6 +49,7 @@ static void syncpt_restore_wait_base(struct host1x_syncpt *sp)
 static void syncpt_read_wait_base(struct host1x_syncpt *sp)
 {
         struct host1x *host = sp->host;
+
         sp->base_val =
                 host1x_sync_readl(host, HOST1X_SYNC_SYNCPT_BASE(sp->id));
 }
diff --git a/drivers/gpu/host1x/intr.c b/drivers/gpu/host1x/intr.c
index c85ca44ff461..a04d10407639 100644
--- a/drivers/gpu/host1x/intr.c
+++ b/drivers/gpu/host1x/intr.c
@@ -122,12 +122,14 @@ static void action_submit_complete(struct host1x_waitlist *waiter)
 static void action_wakeup(struct host1x_waitlist *waiter)
 {
         wait_queue_head_t *wq = waiter->data;
+
         wake_up(wq);
 }
 
 static void action_wakeup_interruptible(struct host1x_waitlist *waiter)
 {
         wait_queue_head_t *wq = waiter->data;
+
         wake_up_interruptible(wq);
 }
 
diff --git a/drivers/gpu/host1x/job.c b/drivers/gpu/host1x/job.c
index 626707585d9b..1bff367f8830 100644
--- a/drivers/gpu/host1x/job.c
+++ b/drivers/gpu/host1x/job.c
@@ -464,6 +464,7 @@ static inline int copy_gathers(struct host1x_job *job, struct device *dev)
 
         for (i = 0; i < job->num_gathers; i++) {
                 struct host1x_job_gather *g = &job->gathers[i];
+
                 size += g->words * sizeof(u32);
         }
 
@@ -514,6 +515,7 @@ int host1x_job_pin(struct host1x_job *job, struct device *dev)
         bitmap_zero(waitchk_mask, host1x_syncpt_nb_pts(host));
         for (i = 0; i < job->num_waitchk; i++) {
                 u32 syncpt_id = job->waitchk[i].syncpt_id;
+
                 if (syncpt_id < host1x_syncpt_nb_pts(host))
                         set_bit(syncpt_id, waitchk_mask);
         }
@@ -571,6 +573,7 @@ void host1x_job_unpin(struct host1x_job *job)
 
         for (i = 0; i < job->num_unpins; i++) {
                 struct host1x_job_unpin_data *unpin = &job->unpins[i];
+
                 host1x_bo_unpin(unpin->bo, unpin->sgt);
                 host1x_bo_put(unpin->bo);
         }
diff --git a/drivers/gpu/host1x/syncpt.c b/drivers/gpu/host1x/syncpt.c
index d70aad5c9f05..7c4848f4ce59 100644
--- a/drivers/gpu/host1x/syncpt.c
+++ b/drivers/gpu/host1x/syncpt.c
@@ -146,6 +146,7 @@ void host1x_syncpt_save(struct host1x *host)
 u32 host1x_syncpt_load(struct host1x_syncpt *sp)
 {
         u32 val;
+
         val = host1x_hw_syncpt_load(sp->host, sp);
         trace_host1x_syncpt_load_min(sp->id, val);
 
@@ -158,6 +159,7 @@ u32 host1x_syncpt_load(struct host1x_syncpt *sp)
 u32 host1x_syncpt_load_wait_base(struct host1x_syncpt *sp)
 {
         u32 val;
+
         host1x_hw_syncpt_load_wait_base(sp->host, sp);
         val = sp->base_val;
         return val;
@@ -279,6 +281,7 @@ bool host1x_syncpt_is_expired(struct host1x_syncpt *sp, u32 thresh)
 {
         u32 current_val;
         u32 future_val;
+
         smp_rmb();
         current_val = (u32)atomic_read(&sp->min_val);
         future_val = (u32)atomic_read(&sp->max_val);
@@ -408,7 +411,7 @@ void host1x_syncpt_deinit(struct host1x *host)
 /*
  * Read max. It indicates how many operations there are in queue, either in
  * channel or in a software thread.
- * */
+ */
 u32 host1x_syncpt_read_max(struct host1x_syncpt *sp)
 {
         smp_rmb();