Commit 9dd5139f authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman

tty: Factor flip buffer initialization into helper function

Factor shared code; prepare for adding 0-sized sentinel flip buffer.
Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1cef50e3
...@@ -22,6 +22,15 @@ ...@@ -22,6 +22,15 @@
#define MIN_TTYB_SIZE 256 #define MIN_TTYB_SIZE 256
#define TTYB_ALIGN_MASK 255 #define TTYB_ALIGN_MASK 255
static void tty_buffer_reset(struct tty_buffer *p, size_t size)
{
p->used = 0;
p->size = size;
p->next = NULL;
p->commit = 0;
p->read = 0;
}
/** /**
* tty_buffer_free_all - free buffers used by a tty * tty_buffer_free_all - free buffers used by a tty
* @tty: tty to free from * @tty: tty to free from
...@@ -70,11 +79,8 @@ static struct tty_buffer *tty_buffer_alloc(struct tty_port *port, size_t size) ...@@ -70,11 +79,8 @@ static struct tty_buffer *tty_buffer_alloc(struct tty_port *port, size_t size)
p = kmalloc(sizeof(struct tty_buffer) + 2 * size, GFP_ATOMIC); p = kmalloc(sizeof(struct tty_buffer) + 2 * size, GFP_ATOMIC);
if (p == NULL) if (p == NULL)
return NULL; return NULL;
p->used = 0;
p->size = size; tty_buffer_reset(p, size);
p->next = NULL;
p->commit = 0;
p->read = 0;
port->buf.memory_used += size; port->buf.memory_used += size;
return p; return p;
} }
...@@ -185,10 +191,7 @@ static struct tty_buffer *tty_buffer_find(struct tty_port *port, size_t size) ...@@ -185,10 +191,7 @@ static struct tty_buffer *tty_buffer_find(struct tty_port *port, size_t size)
struct tty_buffer *t = *tbh; struct tty_buffer *t = *tbh;
*tbh = t->next; *tbh = t->next;
t->next = NULL; tty_buffer_reset(t, t->size);
t->used = 0;
t->commit = 0;
t->read = 0;
port->buf.memory_used += t->size; port->buf.memory_used += t->size;
return t; return t;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment