4 files changed, 9 insertions, 23 deletions

diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index e44933d58790..94948be5d366 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -1015,14 +1015,11 @@ capinc_tty_install(struct tty_driver *driver, struct tty_struct *tty)
 {
         int idx = tty->index;
         struct capiminor *mp = capiminor_get(idx);
-        int ret = tty_init_termios(tty);
+        int ret = tty_standard_install(driver, tty);
 
-        if (ret == 0) {
-                tty_driver_kref_get(driver);
-                tty->count++;
+        if (ret == 0)
                 tty->driver_data = mp;
-                driver->ttys[idx] = tty;
-        } else
+        else
                 capiminor_put(mp);
         return ret;
 }
diff --git a/drivers/misc/pti.c b/drivers/misc/pti.c
index 0b56e3f43573..471ff4c85cd8 100644
--- a/drivers/misc/pti.c
+++ b/drivers/misc/pti.c
@@ -481,13 +481,9 @@ static int pti_tty_install(struct tty_driver *driver, struct tty_struct *tty)
 {
         int idx = tty->index;
         struct pti_tty *pti_tty_data;
-        int ret = tty_init_termios(tty);
+        int ret = tty_standard_install(driver, tty);
 
         if (ret == 0) {
-                tty_driver_kref_get(driver);
-                tty->count++;
-                driver->ttys[idx] = tty;
-
                 pti_tty_data = kmalloc(sizeof(struct pti_tty), GFP_KERNEL);
                 if (pti_tty_data == NULL)
                         return -ENOMEM;
diff --git a/drivers/mmc/card/sdio_uart.c b/drivers/mmc/card/sdio_uart.c
index 2c151e18c9e8..bd4a67cdac3f 100644
--- a/drivers/mmc/card/sdio_uart.c
+++ b/drivers/mmc/card/sdio_uart.c
@@ -750,15 +750,12 @@ static int sdio_uart_install(struct tty_driver *driver, struct tty_struct *tty)
 {
         int idx = tty->index;
         struct sdio_uart_port *port = sdio_uart_port_get(idx);
-        int ret = tty_init_termios(tty);
+        int ret = tty_standard_install(driver, tty);
 
-        if (ret == 0) {
-                tty_driver_kref_get(driver);
-                tty->count++;
+        if (ret == 0)
                 /* This is the ref sdio_uart_port get provided */
                 tty->driver_data = port;
-                driver->ttys[idx] = tty;
-        } else
+        else
                 sdio_uart_port_put(port);
         return ret;
 }
diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c
index fd347ff34d07..580da78b2d86 100644
--- a/drivers/tty/nozomi.c
+++ b/drivers/tty/nozomi.c
@@ -1602,13 +1602,9 @@ static int ntty_install(struct tty_driver *driver, struct tty_struct *tty)
         int ret;
         if (!port || !dc || dc->state != NOZOMI_STATE_READY)
                 return -ENODEV;
-        ret = tty_init_termios(tty);
-        if (ret == 0) {
-                tty_driver_kref_get(driver);
-                tty->count++;
+        ret = tty_standard_install(driver, tty);
+        if (ret == 0)
                 tty->driver_data = port;
-                driver->ttys[tty->index] = tty;
-        }
         return ret;
 }