drivers: tty: Merge alloc_tty_struct and initialize_tty_struct

The two functions alloc_tty_struct and initialize_tty_struct are
always called together. Merge them into alloc_tty_struct, updating its
prototype and the only two callers of these functions.

Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 9 insertions, 10 deletions

diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index 25c9bc783722..ac723e3c031a 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -316,7 +316,7 @@ done:
  *      pty_common_install              -       set up the pty pair
  *      @driver: the pty driver
  *      @tty: the tty being instantiated
- *      @bool: legacy, true if this is BSD style
+ *      @legacy: true if this is BSD style
  *
  *      Perform the initial set up for the tty/pty pair. Called from the
  *      tty layer when the port is first opened.
@@ -331,18 +331,17 @@ static int pty_common_install(struct tty_driver *driver, struct tty_struct *tty,
         int idx = tty->index;
         int retval = -ENOMEM;
 
-        o_tty = alloc_tty_struct();
-        if (!o_tty)
-                goto err;
         ports[0] = kmalloc(sizeof **ports, GFP_KERNEL);
         ports[1] = kmalloc(sizeof **ports, GFP_KERNEL);
         if (!ports[0] || !ports[1])
-                goto err_free_tty;
+                goto err;
         if (!try_module_get(driver->other->owner)) {
                 /* This cannot in fact currently happen */
-                goto err_free_tty;
+                goto err;
         }
-        initialize_tty_struct(o_tty, driver->other, idx);
+        o_tty = alloc_tty_struct(driver->other, idx);
+        if (!o_tty)
+                goto err_put_module;
 
         if (legacy) {
                 /* We always use new tty termios data so we can do this
@@ -387,12 +386,12 @@ err_free_termios:
                 tty_free_termios(tty);
 err_deinit_tty:
         deinitialize_tty_struct(o_tty);
+        free_tty_struct(o_tty);
+err_put_module:
         module_put(o_tty->driver->owner);
-err_free_tty:
+err:
         kfree(ports[0]);
         kfree(ports[1]);
-        free_tty_struct(o_tty);
-err:
         return retval;
 }