Commit 6780bf32 authored by Emil Velikov's avatar Emil Velikov Committed by Emil Velikov

drm/etnaviv: 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: Lucas Stach <l.stach@pengutronix.de>
Cc: Russell King <linux+etnaviv@armlinux.org.uk>
Cc: Christian Gmeiner <christian.gmeiner@gmail.com>
Signed-off-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200515095118.2743122-18-emil.l.velikov@gmail.com
parent dda156cf
...@@ -289,7 +289,7 @@ static int etnaviv_ioctl_gem_cpu_prep(struct drm_device *dev, void *data, ...@@ -289,7 +289,7 @@ static int etnaviv_ioctl_gem_cpu_prep(struct drm_device *dev, void *data,
ret = etnaviv_gem_cpu_prep(obj, args->op, &args->timeout); ret = etnaviv_gem_cpu_prep(obj, args->op, &args->timeout);
drm_gem_object_put_unlocked(obj); drm_gem_object_put(obj);
return ret; return ret;
} }
...@@ -310,7 +310,7 @@ static int etnaviv_ioctl_gem_cpu_fini(struct drm_device *dev, void *data, ...@@ -310,7 +310,7 @@ static int etnaviv_ioctl_gem_cpu_fini(struct drm_device *dev, void *data,
ret = etnaviv_gem_cpu_fini(obj); ret = etnaviv_gem_cpu_fini(obj);
drm_gem_object_put_unlocked(obj); drm_gem_object_put(obj);
return ret; return ret;
} }
...@@ -330,7 +330,7 @@ static int etnaviv_ioctl_gem_info(struct drm_device *dev, void *data, ...@@ -330,7 +330,7 @@ static int etnaviv_ioctl_gem_info(struct drm_device *dev, void *data,
return -ENOENT; return -ENOENT;
ret = etnaviv_gem_mmap_offset(obj, &args->offset); ret = etnaviv_gem_mmap_offset(obj, &args->offset);
drm_gem_object_put_unlocked(obj); drm_gem_object_put(obj);
return ret; return ret;
} }
...@@ -413,7 +413,7 @@ static int etnaviv_ioctl_gem_wait(struct drm_device *dev, void *data, ...@@ -413,7 +413,7 @@ static int etnaviv_ioctl_gem_wait(struct drm_device *dev, void *data,
ret = etnaviv_gem_wait_bo(gpu, obj, timeout); ret = etnaviv_gem_wait_bo(gpu, obj, timeout);
drm_gem_object_put_unlocked(obj); drm_gem_object_put(obj);
return ret; return ret;
} }
......
...@@ -244,7 +244,7 @@ void etnaviv_gem_mapping_unreference(struct etnaviv_vram_mapping *mapping) ...@@ -244,7 +244,7 @@ void etnaviv_gem_mapping_unreference(struct etnaviv_vram_mapping *mapping)
mapping->use -= 1; mapping->use -= 1;
mutex_unlock(&etnaviv_obj->lock); mutex_unlock(&etnaviv_obj->lock);
drm_gem_object_put_unlocked(&etnaviv_obj->base); drm_gem_object_put(&etnaviv_obj->base);
} }
struct etnaviv_vram_mapping *etnaviv_gem_mapping_get( struct etnaviv_vram_mapping *etnaviv_gem_mapping_get(
...@@ -633,7 +633,7 @@ int etnaviv_gem_new_handle(struct drm_device *dev, struct drm_file *file, ...@@ -633,7 +633,7 @@ int etnaviv_gem_new_handle(struct drm_device *dev, struct drm_file *file,
/* drop reference from allocate - handle holds it now */ /* drop reference from allocate - handle holds it now */
fail: fail:
drm_gem_object_put_unlocked(obj); drm_gem_object_put(obj);
return ret; return ret;
} }
...@@ -742,6 +742,6 @@ int etnaviv_gem_new_userptr(struct drm_device *dev, struct drm_file *file, ...@@ -742,6 +742,6 @@ int etnaviv_gem_new_userptr(struct drm_device *dev, struct drm_file *file,
ret = drm_gem_handle_create(file, &etnaviv_obj->base, handle); ret = drm_gem_handle_create(file, &etnaviv_obj->base, handle);
/* drop reference from allocate - handle holds it now */ /* drop reference from allocate - handle holds it now */
drm_gem_object_put_unlocked(&etnaviv_obj->base); drm_gem_object_put(&etnaviv_obj->base);
return ret; return ret;
} }
...@@ -136,7 +136,7 @@ struct drm_gem_object *etnaviv_gem_prime_import_sg_table(struct drm_device *dev, ...@@ -136,7 +136,7 @@ struct drm_gem_object *etnaviv_gem_prime_import_sg_table(struct drm_device *dev,
return &etnaviv_obj->base; return &etnaviv_obj->base;
fail: fail:
drm_gem_object_put_unlocked(&etnaviv_obj->base); drm_gem_object_put(&etnaviv_obj->base);
return ERR_PTR(ret); return ERR_PTR(ret);
} }
...@@ -396,7 +396,7 @@ static void submit_cleanup(struct kref *kref) ...@@ -396,7 +396,7 @@ static void submit_cleanup(struct kref *kref)
/* if the GPU submit failed, objects might still be locked */ /* if the GPU submit failed, objects might still be locked */
submit_unlock_object(submit, i); submit_unlock_object(submit, i);
drm_gem_object_put_unlocked(&etnaviv_obj->base); drm_gem_object_put(&etnaviv_obj->base);
} }
wake_up_all(&submit->gpu->fence_event); wake_up_all(&submit->gpu->fence_event);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment