drm/armada: remove _unlocked suffix in drm_gem_object_put_unlocked
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: Russell King <linux@armlinux.org.uk> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Acked-by: Sam Ravnborg <sam@ravnborg.org> Acked-by: Thomas Zimmermann <tzimmermann@suse.de> Link: https://patchwork.freedesktop.org/patch/msgid/20200515095118.2743122-17-emil.l.velikov@gmail.com
このコミットが含まれているのは:
@@ -710,13 +710,13 @@ static int armada_drm_crtc_cursor_set(struct drm_crtc *crtc,
|
||||
|
||||
/* Must be a kernel-mapped object */
|
||||
if (!obj->addr) {
|
||||
drm_gem_object_put_unlocked(&obj->obj);
|
||||
drm_gem_object_put(&obj->obj);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (obj->obj.size < w * h * 4) {
|
||||
DRM_ERROR("buffer is too small\n");
|
||||
drm_gem_object_put_unlocked(&obj->obj);
|
||||
drm_gem_object_put(&obj->obj);
|
||||
return -ENOMEM;
|
||||
}
|
||||
}
|
||||
@@ -724,7 +724,7 @@ static int armada_drm_crtc_cursor_set(struct drm_crtc *crtc,
|
||||
if (dcrtc->cursor_obj) {
|
||||
dcrtc->cursor_obj->update = NULL;
|
||||
dcrtc->cursor_obj->update_data = NULL;
|
||||
drm_gem_object_put_unlocked(&dcrtc->cursor_obj->obj);
|
||||
drm_gem_object_put(&dcrtc->cursor_obj->obj);
|
||||
}
|
||||
dcrtc->cursor_obj = obj;
|
||||
dcrtc->cursor_w = w;
|
||||
@@ -760,7 +760,7 @@ static void armada_drm_crtc_destroy(struct drm_crtc *crtc)
|
||||
struct armada_private *priv = crtc->dev->dev_private;
|
||||
|
||||
if (dcrtc->cursor_obj)
|
||||
drm_gem_object_put_unlocked(&dcrtc->cursor_obj->obj);
|
||||
drm_gem_object_put(&dcrtc->cursor_obj->obj);
|
||||
|
||||
priv->dcrtc[dcrtc->num] = NULL;
|
||||
drm_crtc_cleanup(&dcrtc->crtc);
|
||||
|
新しいイシューから参照
ユーザーをブロックする