iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tty: simplify buffer allocator cleanups

Browse Source 
Having cleaned up the allocators we might as well remove the inline helpers
for some of it

Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alan Cox 2009-06-11 13:05:49 +01:00 committed by Linus Torvalds
parent c481c707fe
commit 0b4068a128
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/char/n_tty.c
View File

@ -73,17 +73,6 @@
#define ECHO_OP_SET_CANON_COL 0x81 #define ECHO_OP_SET_CANON_COL 0x81
#define ECHO_OP_ERASE_TAB 0x82 #define ECHO_OP_ERASE_TAB 0x82
static inline unsigned char *alloc_buf(void)
{
gfp_t prio = in_interrupt() ? GFP_ATOMIC : GFP_KERNEL;
return kmalloc(N_TTY_BUF_SIZE, prio);
}
static inline void free_buf(unsigned char *buf)
{
kfree(buf);
}
static inline int tty_put_user(struct tty_struct *tty, unsigned char x, static inline int tty_put_user(struct tty_struct *tty, unsigned char x,
unsigned char __user *ptr) unsigned char __user *ptr)
{ {
@ -1551,11 +1540,11 @@ static void n_tty_close(struct tty_struct *tty)
{ {
n_tty_flush_buffer(tty); n_tty_flush_buffer(tty);
if (tty->read_buf) { if (tty->read_buf) {
free_buf(tty->read_buf); kfree(tty->read_buf);
tty->read_buf = NULL; tty->read_buf = NULL;
} }
if (tty->echo_buf) { if (tty->echo_buf) {
free_buf(tty->echo_buf); kfree(tty->echo_buf);
tty->echo_buf = NULL; tty->echo_buf = NULL;
} }
} }
@ -1577,17 +1566,16 @@ static int n_tty_open(struct tty_struct *tty)
/* These are ugly. Currently a malloc failure here can panic */ /* These are ugly. Currently a malloc failure here can panic */
if (!tty->read_buf) { if (!tty->read_buf) {
tty->read_buf = alloc_buf(); tty->read_buf = kzalloc(N_TTY_BUF_SIZE, GFP_KERNEL);
if (!tty->read_buf) if (!tty->read_buf)
return -ENOMEM; return -ENOMEM;
} }
if (!tty->echo_buf) { if (!tty->echo_buf) {
tty->echo_buf = alloc_buf(); tty->echo_buf = kzalloc(N_TTY_BUF_SIZE, GFP_KERNEL);
if (!tty->echo_buf) if (!tty->echo_buf)
return -ENOMEM; return -ENOMEM;
} }
memset(tty->read_buf, 0, N_TTY_BUF_SIZE);
memset(tty->echo_buf, 0, N_TTY_BUF_SIZE);
reset_buffer_flags(tty); reset_buffer_flags(tty);
tty->column = 0; tty->column = 0;
n_tty_set_termios(tty, NULL); n_tty_set_termios(tty, NULL);