Hi Am 07.05.20 um 17:08 schrieb Emil Velikov: > From: Emil Velikov > > Spelling out _unlocked for each and every driver is a annoying. > Especially if we consider how many drivers, do not know (or need to) > about the horror stories involving struct_mutex. > > Just drop the suffix. It makes the API cleaner. > > Done via the following script: > > __from=drm_gem_object_put_unlocked > __to=drm_gem_object_put > for __file in $(git grep --name-only $__from); do > sed -i "s/$__from/$__to/g" $__file; > done > > Cc: Dave Airlie > Cc: David Airlie > Cc: Daniel Vetter > Signed-off-by: Emil Velikov Reviewed-by: Thomas Zimmermann > --- > drivers/gpu/drm/mgag200/mgag200_cursor.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/mgag200/mgag200_cursor.c b/drivers/gpu/drm/mgag200/mgag200_cursor.c > index d491edd317ff..1a50836e003e 100644 > --- a/drivers/gpu/drm/mgag200/mgag200_cursor.c > +++ b/drivers/gpu/drm/mgag200/mgag200_cursor.c > @@ -286,7 +286,7 @@ int mgag200_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv, > ret = PTR_ERR(src); > dev_err(&dev->pdev->dev, > "failed to map user buffer updates\n"); > - goto err_drm_gem_object_put_unlocked; > + goto err_drm_gem_object_put; > } > > ret = mgag200_show_cursor(mdev, src, width, height); > @@ -295,13 +295,13 @@ int mgag200_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv, > > /* Now update internal buffer pointers */ > drm_gem_vram_vunmap(gbo, src); > - drm_gem_object_put_unlocked(obj); > + drm_gem_object_put(obj); > > return 0; > err_drm_gem_vram_vunmap: > drm_gem_vram_vunmap(gbo, src); > -err_drm_gem_object_put_unlocked: > - drm_gem_object_put_unlocked(obj); > +err_drm_gem_object_put: > + drm_gem_object_put(obj); > return ret; > } > > -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer