On Tue, Mar 06, 2018 at 06:48:44PM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> If the property already has the enum value WARN and bail.
> Replacing enum values doesn't make sense to me.
>
> Throw out the pointless list_empty() while at it.
>
> Cc: Daniel Vetter <daniel@xxxxxxxx>
> Suggested-by: Daniel Vetter <daniel@xxxxxxxx>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
> ---
> drivers/gpu/drm/drm_property.c | 11 +++--------
> 1 file changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_property.c b/drivers/gpu/drm/drm_property.c
> index c37ac41125b5..d77b0c4dc485 100644
> --- a/drivers/gpu/drm/drm_property.c
> +++ b/drivers/gpu/drm/drm_property.c
> @@ -390,14 +390,9 @@ int drm_property_add_enum(struct drm_property *property, int index,
> (value > 63))
> return -EINVAL;
>
> - if (!list_empty(&property->enum_list)) {
> - list_for_each_entry(prop_enum, &property->enum_list, head) {
> - if (prop_enum->value == value) {
> - strncpy(prop_enum->name, name, DRM_PROP_NAME_LEN);
> - prop_enum->name[DRM_PROP_NAME_LEN-1] = '\0';
> - return 0;
> - }
> - }
> + list_for_each_entry(prop_enum, &property->enum_list, head) {
> + if (WARN_ON(prop_enum->value == value))
> + return -EINVAL;
> }
>
> prop_enum = kzalloc(sizeof(struct drm_property_enum), GFP_KERNEL);
> --
> 2.16.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
