diff options
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/goldfish.c | 3 | ||||
| -rw-r--r-- | drivers/tty/serial/8250/8250_platform.c | 6 | ||||
| -rw-r--r-- | drivers/tty/serial/jsm/jsm_tty.c | 3 | ||||
| -rw-r--r-- | drivers/tty/serial/serial_core.c | 3 | ||||
| -rw-r--r-- | drivers/tty/tty_io.c | 3 | ||||
| -rw-r--r-- | drivers/tty/vt/keyboard.c | 3 |
6 files changed, 7 insertions, 14 deletions
diff --git a/drivers/tty/goldfish.c b/drivers/tty/goldfish.c index c587ded7f9a5..12d08de59095 100644 --- a/drivers/tty/goldfish.c +++ b/drivers/tty/goldfish.c @@ -238,8 +238,7 @@ static int goldfish_tty_create_driver(void) int ret; struct tty_driver *tty; - goldfish_ttys = kzalloc_objs(*goldfish_ttys, goldfish_tty_line_count, - GFP_KERNEL); + goldfish_ttys = kzalloc_objs(*goldfish_ttys, goldfish_tty_line_count); if (goldfish_ttys == NULL) { ret = -ENOMEM; goto err_alloc_goldfish_ttys_failed; diff --git a/drivers/tty/serial/8250/8250_platform.c b/drivers/tty/serial/8250/8250_platform.c index 37f3ef4d041d..ad3a7bc31d6f 100644 --- a/drivers/tty/serial/8250/8250_platform.c +++ b/drivers/tty/serial/8250/8250_platform.c @@ -111,8 +111,7 @@ static int serial8250_probe_acpi(struct platform_device *pdev) struct resource *regs; int ret, line; - struct uart_8250_port *uart __free(kfree) = kzalloc_obj(*uart, - GFP_KERNEL); + struct uart_8250_port *uart __free(kfree) = kzalloc_obj(*uart); if (!uart) return -ENOMEM; @@ -157,8 +156,7 @@ static int serial8250_probe_platform(struct platform_device *dev, struct plat_se { int ret, i; - struct uart_8250_port *uart __free(kfree) = kzalloc_obj(*uart, - GFP_KERNEL); + struct uart_8250_port *uart __free(kfree) = kzalloc_obj(*uart); if (!uart) return -ENOMEM; diff --git a/drivers/tty/serial/jsm/jsm_tty.c b/drivers/tty/serial/jsm/jsm_tty.c index 8c665fc771dd..286871610c39 100644 --- a/drivers/tty/serial/jsm/jsm_tty.c +++ b/drivers/tty/serial/jsm/jsm_tty.c @@ -391,8 +391,7 @@ int jsm_tty_init(struct jsm_board *brd) * Okay to malloc with GFP_KERNEL, we are not at * interrupt context, and there are no locks held. */ - brd->channels[i] = kzalloc_obj(struct jsm_channel, - GFP_KERNEL); + brd->channels[i] = kzalloc_obj(struct jsm_channel); if (!brd->channels[i]) { jsm_dbg(CORE, &brd->pci_dev, "%s:%d Unable to allocate memory for channel struct\n", diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index 78bb2a5f1cdf..487756947a96 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -3088,8 +3088,7 @@ static int serial_core_add_one_port(struct uart_driver *drv, struct uart_port *u if (uport->attr_group) num_groups++; - uport->tty_groups = kzalloc_objs(*uport->tty_groups, num_groups, - GFP_KERNEL); + uport->tty_groups = kzalloc_objs(*uport->tty_groups, num_groups); if (!uport->tty_groups) return -ENOMEM; diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 0b9a19afc3e7..a5d0457e0e28 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -3344,8 +3344,7 @@ struct tty_driver *__tty_alloc_driver(unsigned int lines, struct module *owner, if (!(flags & TTY_DRIVER_DEVPTS_MEM)) { driver->ttys = kzalloc_objs(*driver->ttys, lines); - driver->termios = kzalloc_objs(*driver->termios, lines, - GFP_KERNEL); + driver->termios = kzalloc_objs(*driver->termios, lines); if (!driver->ttys || !driver->termios) { err = -ENOMEM; goto err_free_all; diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c index dba09eb91f38..13bc048f45e8 100644 --- a/drivers/tty/vt/keyboard.c +++ b/drivers/tty/vt/keyboard.c @@ -1548,8 +1548,7 @@ static int kbd_connect(struct input_handler *handler, struct input_dev *dev, { int error; - struct input_handle __free(kfree) *handle = kzalloc_obj(*handle, - GFP_KERNEL); + struct input_handle __free(kfree) *handle = kzalloc_obj(*handle); if (!handle) return -ENOMEM; |