Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cee51d69 authored by Rusty Russell's avatar Rusty Russell
Browse files

virtio_rpmsg_bus: use simplified virtqueue accessors. 



We never add buffers with input and output parts, so use the new accessors.

Cc: Ohad Ben-Cohen <ohad@wizery.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 71bcbecc

drivers/rpmsg/virtio_rpmsg_bus.c

+4 −4
Original line number Diff line number Diff line
@@ -757,14 +757,14 @@ int rpmsg_send_offchannel_raw(struct rpmsg_channel *rpdev, u32 src, u32 dst, 
	mutex_lock(&vrp->tx_lock);



	/* add message to the remote processor's virtqueue */

	err = virtqueue_add_buf(vrp->svq, &sg, 1, 0, msg, GFP_KERNEL);

	err = virtqueue_add_outbuf(vrp->svq, &sg, 1, msg, GFP_KERNEL);

	if (err) {

		/*

		 * need to reclaim the buffer here, otherwise it's lost

		 * (memory won't leak, but rpmsg won't use it again for TX).

		 * this will wait for a buffer management overhaul.

		 */

		dev_err(dev, "virtqueue_add_buf failed: %d\n", err);

		dev_err(dev, "virtqueue_add_outbuf failed: %d\n", err);

		goto out;

	}
@@ -839,7 +839,7 @@ static void rpmsg_recv_done(struct virtqueue *rvq) 
	sg_init_one(&sg, msg, RPMSG_BUF_SIZE);



	/* add the buffer back to the remote processor's virtqueue */

	err = virtqueue_add_buf(vrp->rvq, &sg, 0, 1, msg, GFP_KERNEL);

	err = virtqueue_add_inbuf(vrp->rvq, &sg, 1, msg, GFP_KERNEL);

	if (err < 0) {

		dev_err(dev, "failed to add a virtqueue buffer: %d\n", err);

		return;
@@ -970,7 +970,7 @@ static int rpmsg_probe(struct virtio_device *vdev) 


		sg_init_one(&sg, cpu_addr, RPMSG_BUF_SIZE);



		err = virtqueue_add_buf(vrp->rvq, &sg, 0, 1, cpu_addr,

		err = virtqueue_add_inbuf(vrp->rvq, &sg, 1, cpu_addr,

								GFP_KERNEL);

		WARN_ON(err); /* sanity check; this can't really happen */

	}