diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2013-03-20 01:14:29 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2013-03-20 01:15:03 -0400 |
commit | 6797999d99587e7b4189cf24c8f1053e02444703 (patch) | |
tree | 623c56ae0f7d38c94466f51980fb6f61c9b85755 /drivers/char/virtio_console.c | |
parent | fb6aa6fcfec29932122cb0fb2d5d1f7700a9883b (diff) |
virtio_console: use simplified virtqueue accessors.
We never add buffers with input and output parts, so use the new accessors.
Acked-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/char/virtio_console.c')
-rw-r--r-- | drivers/char/virtio_console.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index e905d5f53051..6d59f166e0e9 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c | |||
@@ -502,7 +502,7 @@ static int add_inbuf(struct virtqueue *vq, struct port_buffer *buf) | |||
502 | 502 | ||
503 | sg_init_one(sg, buf->buf, buf->size); | 503 | sg_init_one(sg, buf->buf, buf->size); |
504 | 504 | ||
505 | ret = virtqueue_add_buf(vq, sg, 0, 1, buf, GFP_ATOMIC); | 505 | ret = virtqueue_add_inbuf(vq, sg, 1, buf, GFP_ATOMIC); |
506 | virtqueue_kick(vq); | 506 | virtqueue_kick(vq); |
507 | if (!ret) | 507 | if (!ret) |
508 | ret = vq->num_free; | 508 | ret = vq->num_free; |
@@ -569,7 +569,7 @@ static ssize_t __send_control_msg(struct ports_device *portdev, u32 port_id, | |||
569 | vq = portdev->c_ovq; | 569 | vq = portdev->c_ovq; |
570 | 570 | ||
571 | sg_init_one(sg, &cpkt, sizeof(cpkt)); | 571 | sg_init_one(sg, &cpkt, sizeof(cpkt)); |
572 | if (virtqueue_add_buf(vq, sg, 1, 0, &cpkt, GFP_ATOMIC) == 0) { | 572 | if (virtqueue_add_outbuf(vq, sg, 1, &cpkt, GFP_ATOMIC) == 0) { |
573 | virtqueue_kick(vq); | 573 | virtqueue_kick(vq); |
574 | while (!virtqueue_get_buf(vq, &len)) | 574 | while (!virtqueue_get_buf(vq, &len)) |
575 | cpu_relax(); | 575 | cpu_relax(); |
@@ -618,7 +618,7 @@ static ssize_t __send_to_port(struct port *port, struct scatterlist *sg, | |||
618 | 618 | ||
619 | reclaim_consumed_buffers(port); | 619 | reclaim_consumed_buffers(port); |
620 | 620 | ||
621 | err = virtqueue_add_buf(out_vq, sg, nents, 0, data, GFP_ATOMIC); | 621 | err = virtqueue_add_outbuf(out_vq, sg, nents, data, GFP_ATOMIC); |
622 | 622 | ||
623 | /* Tell Host to go! */ | 623 | /* Tell Host to go! */ |
624 | virtqueue_kick(out_vq); | 624 | virtqueue_kick(out_vq); |