From: Nicholas Mc Guire Date: Sat, 11 Apr 2015 13:10:36 +0000 (+0200) Subject: drm/msm: match wait_for_completion_timeout return type X-Git-Tag: v4.2-rc1~13^2~17^2~21 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a51d01f067b34b138deae6ff86276e807c606876;p=karo-tx-linux.git drm/msm: match wait_for_completion_timeout return type 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 Signed-off-by: Rob Clark --- diff --git a/drivers/gpu/drm/msm/edp/edp_ctrl.c b/drivers/gpu/drm/msm/edp/edp_ctrl.c index 29e52d7c61c0..17ae0cc3db70 100644 --- a/drivers/gpu/drm/msm/edp/edp_ctrl.c +++ b/drivers/gpu/drm/msm/edp/edp_ctrl.c @@ -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);