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

Commit 6797999d authored by Rusty Russell's avatar Rusty Russell
Browse files

virtio_console: use simplified virtqueue accessors. 



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

Acked-by: default avatarAmit Shah <amit.shah@redhat.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent fb6aa6fc

drivers/char/virtio_console.c

+3 −3
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ static int add_inbuf(struct virtqueue *vq, struct port_buffer *buf) 


	sg_init_one(sg, buf->buf, buf->size);



	ret = virtqueue_add_buf(vq, sg, 0, 1, buf, GFP_ATOMIC);

	ret = virtqueue_add_inbuf(vq, sg, 1, buf, GFP_ATOMIC);

	virtqueue_kick(vq);

	if (!ret)

		ret = vq->num_free;
@@ -569,7 +569,7 @@ static ssize_t __send_control_msg(struct ports_device *portdev, u32 port_id, 
	vq = portdev->c_ovq;



	sg_init_one(sg, &cpkt, sizeof(cpkt));

	if (virtqueue_add_buf(vq, sg, 1, 0, &cpkt, GFP_ATOMIC) == 0) {

	if (virtqueue_add_outbuf(vq, sg, 1, &cpkt, GFP_ATOMIC) == 0) {

		virtqueue_kick(vq);

		while (!virtqueue_get_buf(vq, &len))

			cpu_relax();
@@ -618,7 +618,7 @@ static ssize_t __send_to_port(struct port *port, struct scatterlist *sg, 


	reclaim_consumed_buffers(port);



	err = virtqueue_add_buf(out_vq, sg, nents, 0, data, GFP_ATOMIC);

	err = virtqueue_add_outbuf(out_vq, sg, nents, data, GFP_ATOMIC);



	/* Tell Host to go! */

	virtqueue_kick(out_vq);