]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
drm/msm: match wait_for_completion_timeout return type
authorNicholas Mc Guire <hofrat@osadl.org>
Sat, 11 Apr 2015 13:10:36 +0000 (15:10 +0200)
committerRob Clark <robdclark@gmail.com>
Thu, 11 Jun 2015 17:11:03 +0000 (13:11 -0400)
return type of wait_for_completion_timeout is unsigned long not int, this
patch assigns the return value of wait_for_completion_timeout to an
appropriately typed and named variable.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
drivers/gpu/drm/msm/edp/edp_ctrl.c

index 29e52d7c61c06873c712254dd3ba4c14c0284f2d..17ae0cc3db70ec5719c953087ff139e0319be649 100644 (file)
@@ -1018,7 +1018,7 @@ static void edp_ctrl_off_worker(struct work_struct *work)
 {
        struct edp_ctrl *ctrl = container_of(
                                work, struct edp_ctrl, off_work);
-       int ret;
+       unsigned long time_left;
 
        mutex_lock(&ctrl->dev_mutex);
 
@@ -1030,11 +1030,11 @@ static void edp_ctrl_off_worker(struct work_struct *work)
        reinit_completion(&ctrl->idle_comp);
        edp_state_ctrl(ctrl, EDP_STATE_CTRL_PUSH_IDLE);
 
-       ret = wait_for_completion_timeout(&ctrl->idle_comp,
+       time_left = wait_for_completion_timeout(&ctrl->idle_comp,
                                                msecs_to_jiffies(500));
-       if (ret <= 0)
-               DBG("%s: idle pattern timedout, %d\n",
-                               __func__, ret);
+       if (time_left <= 0)
+               DBG("%s: idle pattern timedout, %lu\n",
+                               __func__, time_left);
 
        edp_state_ctrl(ctrl, 0);