virtio: rename find_vqs_info() op to find_vqs()

Since the original find_vqs() is no longer present, rename
find_vqs_info() back to find_vqs().

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Message-Id: <20240708074814.1739223-10-jiri@resnulli.us>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

diff --git a/arch/um/drivers/virtio_uml.c b/arch/um/drivers/virtio_uml.c
index 4cc393e903fc7243b6e97dbeb9163613b4719a92..2b6e701776b6b81339c3c48bcfb28152c887c807 100644 (file)
--- a/arch/um/drivers/virtio_uml.c
+++ b/arch/um/drivers/virtio_uml.c
@@ -1099,7 +1099,7 @@ static const struct virtio_config_ops virtio_uml_config_ops = {
        .get_status = vu_get_status,
        .set_status = vu_set_status,
        .reset = vu_reset,
-       .find_vqs_info = vu_find_vqs,
+       .find_vqs = vu_find_vqs,
        .del_vqs = vu_del_vqs,
        .get_features = vu_get_features,
        .finalize_features = vu_finalize_features,

diff --git a/drivers/platform/mellanox/mlxbf-tmfifo.c b/drivers/platform/mellanox/mlxbf-tmfifo.c
index 3dc895cfdc4a86c5b87d6d763b048ad0bb859e29..6c834e39352d61952f644597937ac9cbbbb84544 100644 (file)
--- a/drivers/platform/mellanox/mlxbf-tmfifo.c
+++ b/drivers/platform/mellanox/mlxbf-tmfifo.c
@@ -1175,7 +1175,7 @@ static void tmfifo_virtio_dev_release(struct device *device)
 static const struct virtio_config_ops mlxbf_tmfifo_virtio_config_ops = {
        .get_features = mlxbf_tmfifo_virtio_get_features,
        .finalize_features = mlxbf_tmfifo_virtio_finalize_features,
-       .find_vqs_info = mlxbf_tmfifo_virtio_find_vqs,
+       .find_vqs = mlxbf_tmfifo_virtio_find_vqs,
        .del_vqs = mlxbf_tmfifo_virtio_del_vqs,
        .reset = mlxbf_tmfifo_virtio_reset,
        .set_status = mlxbf_tmfifo_virtio_set_status,

diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c
index 870764c0ad9f0f4669e0a733e48f42f40de5cbcd..d3f39009b28ed27d11b4ac920616667362a77854 100644 (file)
--- a/drivers/remoteproc/remoteproc_virtio.c
+++ b/drivers/remoteproc/remoteproc_virtio.c
@@ -327,7 +327,7 @@ static void rproc_virtio_set(struct virtio_device *vdev, unsigned int offset,
 static const struct virtio_config_ops rproc_virtio_config_ops = {
        .get_features   = rproc_virtio_get_features,
        .finalize_features = rproc_virtio_finalize_features,
-       .find_vqs_info  = rproc_virtio_find_vqs,
+       .find_vqs       = rproc_virtio_find_vqs,
        .del_vqs        = rproc_virtio_del_vqs,
        .reset          = rproc_virtio_reset,
        .set_status     = rproc_virtio_set_status,

diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c
index fa884afff77744bf5806d6998bafc3e5c7b1b587..62eca9419ad76ea30029d8a69518632557438c6f 100644 (file)
--- a/drivers/s390/virtio/virtio_ccw.c
+++ b/drivers/s390/virtio/virtio_ccw.c
@@ -1078,7 +1078,7 @@ static const struct virtio_config_ops virtio_ccw_config_ops = {
        .get_status = virtio_ccw_get_status,
        .set_status = virtio_ccw_set_status,
        .reset = virtio_ccw_reset,
-       .find_vqs_info = virtio_ccw_find_vqs,
+       .find_vqs = virtio_ccw_find_vqs,
        .del_vqs = virtio_ccw_del_vqs,
        .bus_name = virtio_ccw_bus_name,
        .synchronize_cbs = virtio_ccw_synchronize_cbs,

diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
index 57903685d50503173dfb28fec0bd0cd770df493f..90e784e7b7210da05cf93d091b60f1c88f9b6a5e 100644 (file)
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
@@ -570,7 +570,7 @@ static const struct virtio_config_ops virtio_mmio_config_ops = {
        .get_status     = vm_get_status,
        .set_status     = vm_set_status,
        .reset          = vm_reset,
-       .find_vqs_info  = vm_find_vqs,
+       .find_vqs       = vm_find_vqs,
        .del_vqs        = vm_del_vqs,
        .get_features   = vm_get_features,
        .finalize_features = vm_finalize_features,

diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c
index a9786e38d763520a7c8e7f404728b66582fb0c34..d9cbb02b35a112e0940fa45999dd98261ba5e690 100644 (file)
--- a/drivers/virtio/virtio_pci_legacy.c
+++ b/drivers/virtio/virtio_pci_legacy.c
@@ -192,7 +192,7 @@ static const struct virtio_config_ops virtio_pci_config_ops = {
        .get_status     = vp_get_status,
        .set_status     = vp_set_status,
        .reset          = vp_reset,
-       .find_vqs_info  = vp_find_vqs,
+       .find_vqs       = vp_find_vqs,
        .del_vqs        = vp_del_vqs,
        .synchronize_cbs = vp_synchronize_vectors,
        .get_features   = vp_get_features,

diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index adba4a29fdf4d99fa0698c4ffa5c26fe748f550e..3b5b9499a53a658be513cdbe6ebc26805d699f44 100644 (file)
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -781,7 +781,7 @@ static const struct virtio_config_ops virtio_pci_config_nodev_ops = {
        .get_status     = vp_get_status,
        .set_status     = vp_set_status,
        .reset          = vp_reset,
-       .find_vqs_info  = vp_modern_find_vqs,
+       .find_vqs       = vp_modern_find_vqs,
        .del_vqs        = vp_del_vqs,
        .synchronize_cbs = vp_synchronize_vectors,
        .get_features   = vp_get_features,
@@ -803,7 +803,7 @@ static const struct virtio_config_ops virtio_pci_config_ops = {
        .get_status     = vp_get_status,
        .set_status     = vp_set_status,
        .reset          = vp_reset,
-       .find_vqs_info  = vp_modern_find_vqs,
+       .find_vqs       = vp_modern_find_vqs,
        .del_vqs        = vp_del_vqs,
        .synchronize_cbs = vp_synchronize_vectors,
        .get_features   = vp_get_features,

diff --git a/drivers/virtio/virtio_vdpa.c b/drivers/virtio/virtio_vdpa.c
index bc86d81c7cd2ec1dfbf35446af0fc8c681e1132b..7364bd53e38dd451923a1ed9414c050b6affda1f 100644 (file)
--- a/drivers/virtio/virtio_vdpa.c
+++ b/drivers/virtio/virtio_vdpa.c
@@ -469,7 +469,7 @@ static const struct virtio_config_ops virtio_vdpa_config_ops = {
        .get_status     = virtio_vdpa_get_status,
        .set_status     = virtio_vdpa_set_status,
        .reset          = virtio_vdpa_reset,
-       .find_vqs_info  = virtio_vdpa_find_vqs,
+       .find_vqs       = virtio_vdpa_find_vqs,
        .del_vqs        = virtio_vdpa_del_vqs,
        .get_features   = virtio_vdpa_get_features,
        .finalize_features = virtio_vdpa_finalize_features,

diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h
index 1ae346bd2dbd735941bc926d11e0336aa037f5c8..7848fba7f48af43de85a754c1fa9c821af773a7e 100644 (file)
--- a/include/linux/virtio_config.h
+++ b/include/linux/virtio_config.h
@@ -63,7 +63,7 @@ struct virtqueue_info {
  *     After this, status and feature negotiation must be done again
  *     Device must not be reset from its vq/config callbacks, or in
  *     parallel with being added/removed.
- * @find_vqs_info: find virtqueues and instantiate them.
+ * @find_vqs: find virtqueues and instantiate them.
  *     vdev: the virtio_device
  *     nvqs: the number of virtqueues to find
  *     vqs: on success, includes new virtqueues
@@ -116,10 +116,10 @@ struct virtio_config_ops {
        u8 (*get_status)(struct virtio_device *vdev);
        void (*set_status)(struct virtio_device *vdev, u8 status);
        void (*reset)(struct virtio_device *vdev);
-       int (*find_vqs_info)(struct virtio_device *vdev, unsigned int nvqs,
-                            struct virtqueue *vqs[],
-                            struct virtqueue_info vqs_info[],
-                            struct irq_affinity *desc);
+       int (*find_vqs)(struct virtio_device *vdev, unsigned int nvqs,
+                       struct virtqueue *vqs[],
+                       struct virtqueue_info vqs_info[],
+                       struct irq_affinity *desc);
        void (*del_vqs)(struct virtio_device *);
        void (*synchronize_cbs)(struct virtio_device *);
        u64 (*get_features)(struct virtio_device *vdev);
@@ -227,7 +227,7 @@ int virtio_find_vqs_info(struct virtio_device *vdev, unsigned int nvqs,
                         struct virtqueue_info vqs_info[],
                         struct irq_affinity *desc)
 {
-       return vdev->config->find_vqs_info(vdev, nvqs, vqs, vqs_info, desc);
+       return vdev->config->find_vqs(vdev, nvqs, vqs, vqs_info, desc);
 }
 
 static inline