[PATCH 1/3] drm/msm: match wait_for_completion_timeout return type

Nicholas Mc Guire der.herr at hofr.at
Thu Apr 16 00:17:37 PDT 2015


On Mon, 13 Apr 2015, Thierry Reding wrote:

> On Sat, Apr 11, 2015 at 03:10:36PM +0200, Nicholas Mc Guire wrote:
> > 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 at osadl.org>
> > ---
> > 
> > This was compile tested with qcom_defconfig +
> > CONFIG_DRM=m (implies CONFIG_DRM_MSM=m)
> > 
> > Patch is against 4.0-rc7 (localversion-next is -next-20150410)
> > 
> >  drivers/gpu/drm/msm/edp/edp_ctrl.c |   10 +++++-----
> >  1 file changed, 5 insertions(+), 5 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/msm/edp/edp_ctrl.c b/drivers/gpu/drm/msm/edp/edp_ctrl.c
> > index 0ec5abd..831acd6 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)
> 
> Given that time_left is unsigned now, why bother with the "< 0"?
> 
Thats in the second patch - I was ask not do do more than one thing in one
patch - so 1/3 fixed the type/name, 2/3 the return check and 3/3 the DBG.

thx!
hofrat



More information about the dri-devel mailing list