diff options
author | Amit Shah <amit.shah@redhat.com> | 2011-09-14 03:36:44 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-11-01 21:11:00 -0400 |
commit | ce072a0cee420782ed0a079ac17c7ca26056fb95 (patch) | |
tree | 678f0850a3a1fbeee88fb9e1d395141f8b61ac09 /drivers/char | |
parent | d25a9ddae93ca97aa03fdab1363baf0e0c35d960 (diff) |
virtio: console: rename variable
'ret' is a misnomer in discard_port_data() since we don't return the
value. Rename it to 'err'.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/virtio_console.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index cb5edf33bebf..0538425e9a71 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c | |||
@@ -387,8 +387,7 @@ static void discard_port_data(struct port *port) | |||
387 | { | 387 | { |
388 | struct port_buffer *buf; | 388 | struct port_buffer *buf; |
389 | struct virtqueue *vq; | 389 | struct virtqueue *vq; |
390 | unsigned int len; | 390 | unsigned int len, err; |
391 | int ret; | ||
392 | 391 | ||
393 | if (!port->portdev) { | 392 | if (!port->portdev) { |
394 | /* Device has been unplugged. vqs are already gone. */ | 393 | /* Device has been unplugged. vqs are already gone. */ |
@@ -400,18 +399,18 @@ static void discard_port_data(struct port *port) | |||
400 | else | 399 | else |
401 | buf = virtqueue_get_buf(vq, &len); | 400 | buf = virtqueue_get_buf(vq, &len); |
402 | 401 | ||
403 | ret = 0; | 402 | err = 0; |
404 | while (buf) { | 403 | while (buf) { |
405 | if (add_inbuf(vq, buf) < 0) { | 404 | if (add_inbuf(vq, buf) < 0) { |
406 | ret++; | 405 | err++; |
407 | free_buf(buf); | 406 | free_buf(buf); |
408 | } | 407 | } |
409 | buf = virtqueue_get_buf(vq, &len); | 408 | buf = virtqueue_get_buf(vq, &len); |
410 | } | 409 | } |
411 | port->inbuf = NULL; | 410 | port->inbuf = NULL; |
412 | if (ret) | 411 | if (err) |
413 | dev_warn(port->dev, "Errors adding %d buffers back to vq\n", | 412 | dev_warn(port->dev, "Errors adding %d buffers back to vq\n", |
414 | ret); | 413 | err); |
415 | } | 414 | } |
416 | 415 | ||
417 | static bool port_has_data(struct port *port) | 416 | static bool port_has_data(struct port *port) |