]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/mgag200: remove _unlocked suffix in drm_gem_object_put_unlocked
authorEmil Velikov <emil.velikov@collabora.com>
Fri, 15 May 2020 09:51:03 +0000 (10:51 +0100)
committerEmil Velikov <emil.l.velikov@gmail.com>
Tue, 19 May 2020 21:31:33 +0000 (22:31 +0100)
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 <airlied@redhat.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200515095118.2743122-24-emil.l.velikov@gmail.com
drivers/gpu/drm/mgag200/mgag200_cursor.c

index aebc9ce43d551a82716f1aeba1dc36d5e1b3eac1..c6932dc8acf2e4947f369f1262eba43d9b5485f3 100644 (file)
@@ -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;
 }