forked from Minki/linux
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>
This commit is contained in:
parent
76f82a7ab3
commit
81f5835eae
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user