virtio_crypto: convert to use virtio_find_vqs_info()

Instead of passing separate names and callbacks arrays
to virtio_find_vqs(), allocate one of virtual_queue_info structs and
pass it to virtio_find_vqs_info().

Suggested-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Message-Id: <20240708074814.1739223-13-jiri@resnulli.us>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

diff --git a/drivers/crypto/virtio/virtio_crypto_core.c b/drivers/crypto/virtio/virtio_crypto_core.c
index 30cd040aa03b1b267ee8a805ef78b3bd23210add..b8119d1f9931f5ed92f0c48a825b5cb5925e5cc3 100644 (file)
--- a/drivers/crypto/virtio/virtio_crypto_core.c
+++ b/drivers/crypto/virtio/virtio_crypto_core.c
@@ -96,11 +96,10 @@ static void virtcrypto_dataq_callback(struct virtqueue *vq)
 
 static int virtcrypto_find_vqs(struct virtio_crypto *vi)
 {
-       vq_callback_t **callbacks;
+       struct virtqueue_info *vqs_info;
        struct virtqueue **vqs;
        int ret = -ENOMEM;
        int i, total_vqs;
-       const char **names;
        struct device *dev = &vi->vdev->dev;
 
        /*
@@ -114,26 +113,23 @@ static int virtcrypto_find_vqs(struct virtio_crypto *vi)
        vqs = kcalloc(total_vqs, sizeof(*vqs), GFP_KERNEL);
        if (!vqs)
                goto err_vq;
-       callbacks = kcalloc(total_vqs, sizeof(*callbacks), GFP_KERNEL);
-       if (!callbacks)
-               goto err_callback;
-       names = kcalloc(total_vqs, sizeof(*names), GFP_KERNEL);
-       if (!names)
-               goto err_names;
+       vqs_info = kcalloc(total_vqs, sizeof(*vqs_info), GFP_KERNEL);
+       if (!vqs_info)
+               goto err_vqs_info;
 
        /* Parameters for control virtqueue */
-       callbacks[total_vqs - 1] = virtcrypto_ctrlq_callback;
-       names[total_vqs - 1] = "controlq";
+       vqs_info[total_vqs - 1].callback = virtcrypto_ctrlq_callback;
+       vqs_info[total_vqs - 1].name = "controlq";
 
        /* Allocate/initialize parameters for data virtqueues */
        for (i = 0; i < vi->max_data_queues; i++) {
-               callbacks[i] = virtcrypto_dataq_callback;
+               vqs_info[i].callback = virtcrypto_dataq_callback;
                snprintf(vi->data_vq[i].name, sizeof(vi->data_vq[i].name),
                                "dataq.%d", i);
-               names[i] = vi->data_vq[i].name;
+               vqs_info[i].name = vi->data_vq[i].name;
        }
 
-       ret = virtio_find_vqs(vi->vdev, total_vqs, vqs, callbacks, names, NULL);
+       ret = virtio_find_vqs_info(vi->vdev, total_vqs, vqs, vqs_info, NULL);
        if (ret)
                goto err_find;
 
@@ -153,18 +149,15 @@ static int virtcrypto_find_vqs(struct virtio_crypto *vi)
                                (unsigned long)&vi->data_vq[i]);
        }
 
-       kfree(names);
-       kfree(callbacks);
+       kfree(vqs_info);
        kfree(vqs);
 
        return 0;
 
 err_engine:
 err_find:
-       kfree(names);
-err_names:
-       kfree(callbacks);
-err_callback:
+       kfree(vqs_info);
+err_vqs_info:
        kfree(vqs);
 err_vq:
        return ret;