TTY: use tty_standard_install

Use the helper in the rest of the tty drivers. This is a simple
replacement.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index e44933d587905d3f375cd4e9812c43273f132b44..94948be5d366b130bbec5b50046f7c3ff4496464 100644 (file)
--- 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 0b56e3f43573d9664f6e2a778d3384b47b9de161..471ff4c85cd846b3725697781658c4f4c8b69579 100644 (file)
--- 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 2c151e18c9e847b147798386fd2effdb03b4465e..bd4a67cdac3fcd41347f97319b4014be8658b559 100644 (file)
--- 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 fd347ff34d071dc14972faaa2d3e89ef9260475c..580da78b2d8692c89ce4d6cfb139eabd2b1c97b7 100644 (file)
--- 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;
 }