leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/armada: remove _unlocked suffix in drm_gem_object_put_unlocked

Browse Source 
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
This commit is contained in:
Emil Velikov
2020-05-15 10:50:56 +01:00
committed by Emil Velikov
parent 38e7abf7e9
commit dda156cf89
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/armada/armada_crtc.c
View File

@@ -710,13 +710,13 @@ static int armada_drm_crtc_cursor_set(struct drm_crtc *crtc,
/* Must be a kernel-mapped object */ /* Must be a kernel-mapped object */
if (!obj->addr) { if (!obj->addr) {
drm_gem_object_put_unlocked(&obj->obj); drm_gem_object_put(&obj->obj);
return -EINVAL; return -EINVAL;
} }
if (obj->obj.size < w * h * 4) { if (obj->obj.size < w * h * 4) {
DRM_ERROR("buffer is too small\n"); DRM_ERROR("buffer is too small\n");
drm_gem_object_put_unlocked(&obj->obj); drm_gem_object_put(&obj->obj);
return -ENOMEM; return -ENOMEM;
} }
} }
@@ -724,7 +724,7 @@ static int armada_drm_crtc_cursor_set(struct drm_crtc *crtc,
if (dcrtc->cursor_obj) { if (dcrtc->cursor_obj) {
dcrtc->cursor_obj->update = NULL; dcrtc->cursor_obj->update = NULL;
dcrtc->cursor_obj->update_data = 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_obj = obj;
dcrtc->cursor_w = w; 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; struct armada_private *priv = crtc->dev->dev_private;
if (dcrtc->cursor_obj) 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; priv->dcrtc[dcrtc->num] = NULL;
drm_crtc_cleanup(&dcrtc->crtc); drm_crtc_cleanup(&dcrtc->crtc);

4
drivers/gpu/drm/armada/armada_fb.c
View File

@@ -129,12 +129,12 @@ struct drm_framebuffer *armada_fb_create(struct drm_device *dev,
goto err; goto err;
} }
drm_gem_object_put_unlocked(&obj->obj); drm_gem_object_put(&obj->obj);
return &dfb->fb; return &dfb->fb;
err_unref: err_unref:
drm_gem_object_put_unlocked(&obj->obj); drm_gem_object_put(&obj->obj);
err: err:
DRM_ERROR("failed to initialize framebuffer: %d\n", ret); DRM_ERROR("failed to initialize framebuffer: %d\n", ret);
return ERR_PTR(ret); return ERR_PTR(ret);

6
drivers/gpu/drm/armada/armada_fbdev.c
View File

@@ -51,13 +51,13 @@ static int armada_fbdev_create(struct drm_fb_helper *fbh,
ret = armada_gem_linear_back(dev, obj); ret = armada_gem_linear_back(dev, obj);
if (ret) { if (ret) {
drm_gem_object_put_unlocked(&obj->obj); drm_gem_object_put(&obj->obj);
return ret; return ret;
} }
ptr = armada_gem_map_object(dev, obj); ptr = armada_gem_map_object(dev, obj);
if (!ptr) { if (!ptr) {
drm_gem_object_put_unlocked(&obj->obj); drm_gem_object_put(&obj->obj);
return -ENOMEM; return -ENOMEM;
} }
@@ -67,7 +67,7 @@ static int armada_fbdev_create(struct drm_fb_helper *fbh,
* A reference is now held by the framebuffer object if * A reference is now held by the framebuffer object if
* successful, otherwise this drops the ref for the error path. * successful, otherwise this drops the ref for the error path.
*/ */
drm_gem_object_put_unlocked(&obj->obj); drm_gem_object_put(&obj->obj);
if (IS_ERR(dfb)) if (IS_ERR(dfb))
return PTR_ERR(dfb); return PTR_ERR(dfb);

10
drivers/gpu/drm/armada/armada_gem.c
View File

@@ -256,7 +256,7 @@ int armada_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
/* drop reference from allocate - handle holds it now */ /* drop reference from allocate - handle holds it now */
DRM_DEBUG_DRIVER("obj %p size %zu handle %#x\n", dobj, size, handle); DRM_DEBUG_DRIVER("obj %p size %zu handle %#x\n", dobj, size, handle);
err: err:
drm_gem_object_put_unlocked(&dobj->obj); drm_gem_object_put(&dobj->obj);
return ret; return ret;
} }
@@ -288,7 +288,7 @@ int armada_gem_create_ioctl(struct drm_device *dev, void *data,
/* drop reference from allocate - handle holds it now */ /* drop reference from allocate - handle holds it now */
DRM_DEBUG_DRIVER("obj %p size %zu handle %#x\n", dobj, size, handle); DRM_DEBUG_DRIVER("obj %p size %zu handle %#x\n", dobj, size, handle);
err: err:
drm_gem_object_put_unlocked(&dobj->obj); drm_gem_object_put(&dobj->obj);
return ret; return ret;
} }
@@ -305,13 +305,13 @@ int armada_gem_mmap_ioctl(struct drm_device *dev, void *data,
return -ENOENT; return -ENOENT;
if (!dobj->obj.filp) { if (!dobj->obj.filp) {
drm_gem_object_put_unlocked(&dobj->obj); drm_gem_object_put(&dobj->obj);
return -EINVAL; return -EINVAL;
} }
addr = vm_mmap(dobj->obj.filp, 0, args->size, PROT_READ | PROT_WRITE, addr = vm_mmap(dobj->obj.filp, 0, args->size, PROT_READ | PROT_WRITE,
MAP_SHARED, args->offset); MAP_SHARED, args->offset);
drm_gem_object_put_unlocked(&dobj->obj); drm_gem_object_put(&dobj->obj);
if (IS_ERR_VALUE(addr)) if (IS_ERR_VALUE(addr))
return addr; return addr;
@@ -366,7 +366,7 @@ int armada_gem_pwrite_ioctl(struct drm_device *dev, void *data,
} }
unref: unref:
drm_gem_object_put_unlocked(&dobj->obj); drm_gem_object_put(&dobj->obj);
return ret; return ret;
} }