[PATCH v6 11/12] remoteproc: switch to virtio_legacy_init/size

From: Michael S. Tsirkin
Date: Mon Apr 06 2020 - 18:27:06 EST


These are used for legacy ring format, switch to APIs that make this
explicit.

Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
---

maintainers, pls ack merging this through virtio tree due to dependency
on previous patches in the patchset.

drivers/remoteproc/remoteproc_core.c | 2 +-
drivers/remoteproc/remoteproc_virtio.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 097f33e4f1f3..c350a01e6c4e 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -322,7 +322,7 @@ int rproc_alloc_vring(struct rproc_vdev *rvdev, int i)
struct rproc_mem_entry *mem;

/* actual size of vring (in bytes) */
- size = PAGE_ALIGN(vring_size(rvring->len, rvring->align));
+ size = PAGE_ALIGN(vring_legacy_size(rvring->len, rvring->align));

rsc = (void *)rproc->table_ptr + rvdev->rsc_offset;

diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c
index 8c07cb2ca8ba..35b02468197a 100644
--- a/drivers/remoteproc/remoteproc_virtio.c
+++ b/drivers/remoteproc/remoteproc_virtio.c
@@ -95,7 +95,7 @@ static struct virtqueue *rp_find_vq(struct virtio_device *vdev,
len = rvring->len;

/* zero vring */
- size = vring_size(len, rvring->align);
+ size = vring_legacy_size(len, rvring->align);
memset(addr, 0, size);

dev_dbg(dev, "vring%d: va %pK qsz %d notifyid %d\n",
--
MST