drm/virtio: simplify virtio_gpu_alloc_cmd

Just call virtio_gpu_alloc_cmd_resp with some fixed args
instead of duplicating most of the function body.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20200207074638.26386-2-kraxel@redhat.com
Reviewed-by: Chia-I Wu <olvaffe@gmail.com>

diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c
index cc02fc4bab2a53acd70c18b9cbc360ce873813f5..350ddbf8a42de9efdfcfb6a582307198e443c9c5 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_vq.c
+++ b/drivers/gpu/drm/virtio/virtgpu_vq.c
@@ -120,23 +120,6 @@ virtio_gpu_vbuf_ctrl_hdr(struct virtio_gpu_vbuffer *vbuf)
        return (struct virtio_gpu_ctrl_hdr *)vbuf->buf;
 }
 
-static void *virtio_gpu_alloc_cmd(struct virtio_gpu_device *vgdev,
-                                 struct virtio_gpu_vbuffer **vbuffer_p,
-                                 int size)
-{
-       struct virtio_gpu_vbuffer *vbuf;
-
-       vbuf = virtio_gpu_get_vbuf(vgdev, size,
-                                  sizeof(struct virtio_gpu_ctrl_hdr),
-                                  NULL, NULL);
-       if (IS_ERR(vbuf)) {
-               *vbuffer_p = NULL;
-               return ERR_CAST(vbuf);
-       }
-       *vbuffer_p = vbuf;
-       return vbuf->buf;
-}
-
 static struct virtio_gpu_update_cursor*
 virtio_gpu_alloc_cursor(struct virtio_gpu_device *vgdev,
                        struct virtio_gpu_vbuffer **vbuffer_p)
@@ -172,6 +155,15 @@ static void *virtio_gpu_alloc_cmd_resp(struct virtio_gpu_device *vgdev,
        return (struct virtio_gpu_command *)vbuf->buf;
 }
 
+static void *virtio_gpu_alloc_cmd(struct virtio_gpu_device *vgdev,
+                                 struct virtio_gpu_vbuffer **vbuffer_p,
+                                 int size)
+{
+       return virtio_gpu_alloc_cmd_resp(vgdev, NULL, vbuffer_p, size,
+                                        sizeof(struct virtio_gpu_ctrl_hdr),
+                                        NULL);
+}
+
 static void free_vbuf(struct virtio_gpu_device *vgdev,
                      struct virtio_gpu_vbuffer *vbuf)
 {