From: Amit Shah Date: Wed, 14 Sep 2011 07:36:44 +0000 (+0530) Subject: virtio: console: rename variable X-Git-Tag: next-20111025~50^2~6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=80c28c40bf376e29ae2b68605f6b76166ff4cbe6;p=karo-tx-linux.git 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 --- 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) { struct port_buffer *buf; struct virtqueue *vq; - unsigned int len; - int ret; + unsigned int len, err; if (!port->portdev) { /* Device has been unplugged. vqs are already gone. */ @@ -400,18 +399,18 @@ static void discard_port_data(struct port *port) else buf = virtqueue_get_buf(vq, &len); - ret = 0; + err = 0; while (buf) { if (add_inbuf(vq, buf) < 0) { - ret++; + err++; free_buf(buf); } buf = virtqueue_get_buf(vq, &len); } port->inbuf = NULL; - if (ret) + if (err) dev_warn(port->dev, "Errors adding %d buffers back to vq\n", - ret); + err); } static bool port_has_data(struct port *port)