Re: [RFCv1 08/12] drm: Refactor object property check code

["Ville Syrjälä" <ville.syrjala@linux.intel.com>]

On Sat, Oct 05, 2013 at 08:45:46PM -0400, Rob Clark wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Refactor the code to check whether an object has a specific property
> to a new function.
> 
> v1: original
> v2: rebase on atomic -- Rob Clark
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  drivers/gpu/drm/drm_crtc.c | 25 ++++++++++++++-----------
>  1 file changed, 14 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
> index c0546e8..776edf3 100644
> --- a/drivers/gpu/drm/drm_crtc.c
> +++ b/drivers/gpu/drm/drm_crtc.c
> @@ -3374,6 +3374,19 @@ static int drm_mode_set_obj_prop(struct drm_mode_object *obj,
>  	return -EINVAL;
>  }
>  
> +static bool object_has_prop(const struct drm_mode_object *obj, u32 prop_id)
> +{
> +	int i;
> +
> +	if (!obj->properties)
> +		return false;
> +
> +	for (i = 0; i < obj->properties->count; i++)
> +		if (obj->properties->ids[i] == prop_id)
> +			return true;
> +	return false;
> +}
> +
>  /* call with mode_config mutex held */
>  static int drm_mode_set_obj_prop_id(struct drm_device *dev, void *state,
>  		uint32_t obj_id, uint32_t obj_type,
> @@ -3382,19 +3395,9 @@ static int drm_mode_set_obj_prop_id(struct drm_device *dev, void *state,
>  	struct drm_mode_object *arg_obj;
>  	struct drm_mode_object *prop_obj;
>  	struct drm_property *property;
> -	int i;
>  
>  	arg_obj = drm_mode_object_find(dev, obj_id, obj_type);
> -	if (!arg_obj)
> -		return -EINVAL;
> -	if (!arg_obj->properties)
> -		return -EINVAL;
> -
> -	for (i = 0; i < arg_obj->properties->count; i++)
> -		if (arg_obj->properties->ids[i] == prop_id)
> -			break;
> -
> -	if (i == arg_obj->properties->count)
> +	if (!(arg_obj && object_has_prop(arg_obj, prop_id)))
>  		return -EINVAL;

-ENOENT would actually seem more appropriate here.

>  
>  	prop_obj = drm_mode_object_find(dev, prop_id,
> -- 
> 1.8.3.1

-- 
Ville Syrjälä
Intel OTC