]> www.infradead.org Git - users/willy/xarray.git/commitdiff
caif_virtio: use virtio_find_single_vq() for single virtqueue finding
authorJiri Pirko <jiri@nvidia.com>
Mon, 8 Jul 2024 07:47:56 +0000 (09:47 +0200)
committerMichael S. Tsirkin <mst@redhat.com>
Wed, 17 Jul 2024 09:20:56 +0000 (05:20 -0400)
Since caif uses only one queue, convert to virtio_find_single_vq()
helper which is made for this purpose.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Message-Id: <20240708074814.1739223-2-jiri@resnulli.us>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
drivers/net/caif/caif_virtio.c

index 99d984851fefe124ef39d4e167d72db8b4a6f9ac..7fea00c7ca8a6ae57feeeb150281fbaec3761445 100644 (file)
@@ -646,9 +646,7 @@ static inline void debugfs_init(struct cfv_info *cfv)
 /* Setup CAIF for the a virtio device */
 static int cfv_probe(struct virtio_device *vdev)
 {
-       vq_callback_t *vq_cbs = cfv_release_cb;
        vrh_callback_t *vrh_cbs = cfv_recv;
-       const char *names =  "output";
        const char *cfv_netdev_name = "cfvrt";
        struct net_device *netdev;
        struct cfv_info *cfv;
@@ -675,9 +673,11 @@ static int cfv_probe(struct virtio_device *vdev)
                goto err;
 
        /* Get the TX virtio ring. This is a "guest side vring". */
-       err = virtio_find_vqs(vdev, 1, &cfv->vq_tx, &vq_cbs, &names, NULL);
-       if (err)
+       cfv->vq_tx = virtio_find_single_vq(vdev, cfv_release_cb, "output");
+       if (IS_ERR(cfv->vq_tx)) {
+               err = PTR_ERR(cfv->vq_tx);
                goto err;
+       }
 
        /* Get the CAIF configuration from virtio config space, if available */
        if (vdev->config->get) {