1 files changed, 7 insertions, 9 deletions

diff --git a/drivers/gpu/host1x/intr.c b/drivers/gpu/host1x/intr.c
index 2491bf82e30c..8b4fad0ab35d 100644
--- a/drivers/gpu/host1x/intr.c
+++ b/drivers/gpu/host1x/intr.c
@@ -122,18 +122,20 @@ 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);
 }
 
 typedef void (*action_handler)(struct host1x_waitlist *waiter);
 
-static action_handler action_handlers[HOST1X_INTR_ACTION_COUNT] = {
+static const action_handler action_handlers[HOST1X_INTR_ACTION_COUNT] = {
         action_submit_complete,
         action_wakeup,
         action_wakeup_interruptible,
@@ -209,7 +211,7 @@ static void syncpt_thresh_work(struct work_struct *work)
                                 host1x_syncpt_load(host->syncpt + id));
 }
 
-int host1x_intr_add_action(struct host1x *host, u32 id, u32 thresh,
+int host1x_intr_add_action(struct host1x *host, unsigned int id, u32 thresh,
                            enum host1x_intr_action action, void *data,
                            struct host1x_waitlist *waiter, void **ref)
 {
@@ -254,7 +256,7 @@ int host1x_intr_add_action(struct host1x *host, u32 id, u32 thresh,
         return 0;
 }
 
-void host1x_intr_put_ref(struct host1x *host, u32 id, void *ref)
+void host1x_intr_put_ref(struct host1x *host, unsigned int id, void *ref)
 {
         struct host1x_waitlist *waiter = ref;
         struct host1x_syncpt *syncpt;
@@ -277,9 +279,6 @@ int host1x_intr_init(struct host1x *host, unsigned int irq_sync)
 
         mutex_init(&host->intr_mutex);
         host->intr_syncpt_irq = irq_sync;
-        host->intr_wq = create_workqueue("host_syncpt");
-        if (!host->intr_wq)
-                return -ENOMEM;
 
         for (id = 0; id < nb_pts; ++id) {
                 struct host1x_syncpt *syncpt = host->syncpt + id;
@@ -288,7 +287,7 @@ int host1x_intr_init(struct host1x *host, unsigned int irq_sync)
                 INIT_LIST_HEAD(&syncpt->intr.wait_head);
                 snprintf(syncpt->intr.thresh_irq_name,
                          sizeof(syncpt->intr.thresh_irq_name),
-                         "host1x_sp_%02d", id);
+                         "host1x_sp_%02u", id);
         }
 
         host1x_intr_start(host);
@@ -299,7 +298,6 @@ int host1x_intr_init(struct host1x *host, unsigned int irq_sync)
 void host1x_intr_deinit(struct host1x *host)
 {
         host1x_intr_stop(host);
-        destroy_workqueue(host->intr_wq);
 }
 
 void host1x_intr_start(struct host1x *host)
@@ -342,7 +340,7 @@ void host1x_intr_stop(struct host1x *host)
                 if (!list_empty(&syncpt[id].intr.wait_head)) {
                         /* output diagnostics */
                         mutex_unlock(&host->intr_mutex);
-                        pr_warn("%s cannot stop syncpt intr id=%d\n",
+                        pr_warn("%s cannot stop syncpt intr id=%u\n",
                                 __func__, id);
                         return;
                 }