evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

virtio: console: make it clear that virtqueue_add_buf() no longer returns > 0

Browse source 
We simplified virtqueue_add_buf(), make it clear in the callers.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2012-10-16 23:56:15 +10:30
parent 98e8c6bc66
commit 589575a235
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/char/virtio_console.c
View file

@ -461,7 +461,7 @@ static ssize_t __send_control_msg(struct ports_device *portdev, u32 port_id,
vq = portdev->c_ovq; vq = portdev->c_ovq;
sg_init_one(sg, &cpkt, sizeof(cpkt)); sg_init_one(sg, &cpkt, sizeof(cpkt));
if (virtqueue_add_buf(vq, sg, 1, 0, &cpkt, GFP_ATOMIC) >= 0) { if (virtqueue_add_buf(vq, sg, 1, 0, &cpkt, GFP_ATOMIC) == 0) {
virtqueue_kick(vq); virtqueue_kick(vq);
while (!virtqueue_get_buf(vq, &len)) while (!virtqueue_get_buf(vq, &len))
cpu_relax(); cpu_relax();
@ -526,7 +526,7 @@ static ssize_t __send_to_port(struct port *port, struct scatterlist *sg,
struct buffer_token *tok, bool nonblock) struct buffer_token *tok, bool nonblock)
{ {
struct virtqueue *out_vq; struct virtqueue *out_vq;
ssize_t ret; int err;
unsigned long flags; unsigned long flags;
unsigned int len; unsigned int len;
@ -536,17 +536,17 @@ static ssize_t __send_to_port(struct port *port, struct scatterlist *sg,
reclaim_consumed_buffers(port); reclaim_consumed_buffers(port);
ret = virtqueue_add_buf(out_vq, sg, nents, 0, tok, GFP_ATOMIC); err = virtqueue_add_buf(out_vq, sg, nents, 0, tok, GFP_ATOMIC);
/* Tell Host to go! */ /* Tell Host to go! */
virtqueue_kick(out_vq); virtqueue_kick(out_vq);
if (ret < 0) { if (err) {
in_count = 0; in_count = 0;
goto done; goto done;
} }
if (ret == 0) if (out_vq->num_free == 0)
port->outvq_full = true; port->outvq_full = true;
if (nonblock) if (nonblock)