[PATCH v6 12/18] drm/virtio: remove virtio_gpu_alloc_object

[Gerd Hoffmann]

Thin wrapper around virtio_gpu_object_create(),
but calling that directly works equally well.

Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
Acked-by: Daniel Vetter <daniel.vet...@ffwll.ch>
---
 drivers/gpu/drm/virtio/virtgpu_drv.h   |  4 ----
 drivers/gpu/drm/virtio/virtgpu_gem.c   | 23 ++++-------------------
 drivers/gpu/drm/virtio/virtgpu_ioctl.c |  6 +++---
 3 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h 
b/drivers/gpu/drm/virtio/virtgpu_drv.h
index f8a586029400..577a8103670e 100644
--- a/drivers/gpu/drm/virtio/virtgpu_drv.h
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.h
@@ -229,10 +229,6 @@ int virtio_gpu_gem_object_open(struct drm_gem_object *obj,
                               struct drm_file *file);
 void virtio_gpu_gem_object_close(struct drm_gem_object *obj,
                                 struct drm_file *file);
-struct virtio_gpu_object*
-virtio_gpu_alloc_object(struct drm_device *dev,
-                       struct virtio_gpu_object_params *params,
-                       struct virtio_gpu_fence *fence);
 int virtio_gpu_mode_dumb_create(struct drm_file *file_priv,
                                struct drm_device *dev,
                                struct drm_mode_create_dumb *args);
diff --git a/drivers/gpu/drm/virtio/virtgpu_gem.c 
b/drivers/gpu/drm/virtio/virtgpu_gem.c
index 8a95864404ca..6baf64141645 100644
--- a/drivers/gpu/drm/virtio/virtgpu_gem.c
+++ b/drivers/gpu/drm/virtio/virtgpu_gem.c
@@ -26,35 +26,20 @@
 #include <drm/drmP.h>
 #include "virtgpu_drv.h"
 
-struct virtio_gpu_object*
-virtio_gpu_alloc_object(struct drm_device *dev,
-                       struct virtio_gpu_object_params *params,
-                       struct virtio_gpu_fence *fence)
-{
-       struct virtio_gpu_device *vgdev = dev->dev_private;
-       struct virtio_gpu_object *obj;
-       int ret;
-
-       ret = virtio_gpu_object_create(vgdev, params, &obj, fence);
-       if (ret)
-               return ERR_PTR(ret);
-
-       return obj;
-}
-
 int virtio_gpu_gem_create(struct drm_file *file,
                          struct drm_device *dev,
                          struct virtio_gpu_object_params *params,
                          struct drm_gem_object **obj_p,
                          uint32_t *handle_p)
 {
+       struct virtio_gpu_device *vgdev = dev->dev_private;
        struct virtio_gpu_object *obj;
        int ret;
        u32 handle;
 
-       obj = virtio_gpu_alloc_object(dev, params, NULL);
-       if (IS_ERR(obj))
-               return PTR_ERR(obj);
+       ret = virtio_gpu_object_create(vgdev, params, &obj, NULL);
+       if (ret < 0)
+               return ret;
 
        ret = drm_gem_handle_create(file, &obj->base.base, &handle);
        if (ret) {
diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c 
b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
index 107057816e1f..0d0acf0b85ed 100644
--- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
+++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
@@ -254,10 +254,10 @@ static int virtio_gpu_resource_create_ioctl(struct 
drm_device *dev, void *data,
        fence = virtio_gpu_fence_alloc(vgdev);
        if (!fence)
                return -ENOMEM;
-       qobj = virtio_gpu_alloc_object(dev, &params, fence);
+       ret = virtio_gpu_object_create(vgdev, &params, &qobj, fence);
        dma_fence_put(&fence->f);
-       if (IS_ERR(qobj))
-               return PTR_ERR(qobj);
+       if (ret < 0)
+               return ret;
        obj = &qobj->base.base;
 
        ret = drm_gem_handle_create(file_priv, obj, &handle);
-- 
2.18.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel