Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0b4068a1287b02018d1b3159e7be6f27f3e3e68c

Authored by Alan Cox
Committed by Linus Torvalds
1 parent c481c707fe
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

tty: simplify buffer allocator cleanups 

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>

Showing 1 changed file with 5 additions and 17 deletions Side-by-side Diff

drivers/char/n_tty.c
Diff comments   View file @ 0b4068a
... ... @@ -73,17 +73,6 @@
73 73 #define ECHO_OP_SET_CANON_COL 0x81
74 74 #define ECHO_OP_ERASE_TAB 0x82
75 75  
76   -static inline unsigned char *alloc_buf(void)
77   -{
78   - gfp_t prio = in_interrupt() ? GFP_ATOMIC : GFP_KERNEL;
79   - return kmalloc(N_TTY_BUF_SIZE, prio);
80   -}
81   -
82   -static inline void free_buf(unsigned char *buf)
83   -{
84   - kfree(buf);
85   -}
86   -
87 76 static inline int tty_put_user(struct tty_struct *tty, unsigned char x,
88 77 unsigned char __user *ptr)
89 78 {
90 79  
... ... @@ -1551,11 +1540,11 @@
1551 1540 {
1552 1541 n_tty_flush_buffer(tty);
1553 1542 if (tty->read_buf) {
1554   - free_buf(tty->read_buf);
  1543 + kfree(tty->read_buf);
1555 1544 tty->read_buf = NULL;
1556 1545 }
1557 1546 if (tty->echo_buf) {
1558   - free_buf(tty->echo_buf);
  1547 + kfree(tty->echo_buf);
1559 1548 tty->echo_buf = NULL;
1560 1549 }
1561 1550 }
1562 1551  
1563 1552  
... ... @@ -1577,17 +1566,16 @@
1577 1566  
1578 1567 /* These are ugly. Currently a malloc failure here can panic */
1579 1568 if (!tty->read_buf) {
1580   - tty->read_buf = alloc_buf();
  1569 + tty->read_buf = kzalloc(N_TTY_BUF_SIZE, GFP_KERNEL);
1581 1570 if (!tty->read_buf)
1582 1571 return -ENOMEM;
1583 1572 }
1584 1573 if (!tty->echo_buf) {
1585   - tty->echo_buf = alloc_buf();
  1574 + tty->echo_buf = kzalloc(N_TTY_BUF_SIZE, GFP_KERNEL);
  1575 +
1586 1576 if (!tty->echo_buf)
1587 1577 return -ENOMEM;
1588 1578 }
1589   - memset(tty->read_buf, 0, N_TTY_BUF_SIZE);
1590   - memset(tty->echo_buf, 0, N_TTY_BUF_SIZE);
1591 1579 reset_buffer_flags(tty);
1592 1580 tty->column = 0;
1593 1581 n_tty_set_termios(tty, NULL);