Merge tag 'usb-serial-5.15-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / tty / mxser.c

diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index 900ccb2..1216f39 100644 (file)
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c
@@ -1039,12 +1039,12 @@ static int mxser_get_serial_info(struct tty_struct *tty,
        if (closing_wait != ASYNC_CLOSING_WAIT_NONE)
                closing_wait = jiffies_to_msecs(closing_wait) / 10;
 
-       ss->type = info->type,
-       ss->line = tty->index,
-       ss->port = info->ioaddr,
-       ss->irq = info->board->irq,
-       ss->flags = info->port.flags,
-       ss->baud_base = MXSER_BAUD_BASE,
+       ss->type = info->type;
+       ss->line = tty->index;
+       ss->port = info->ioaddr;
+       ss->irq = info->board->irq;
+       ss->flags = info->port.flags;
+       ss->baud_base = MXSER_BAUD_BASE;
        ss->close_delay = close_delay;
        ss->closing_wait = closing_wait;
        ss->custom_divisor = MXSER_CUSTOM_DIVISOR,
@@ -1976,9 +1976,10 @@ static int __init mxser_module_init(void)
 {
        int retval;
 
-       mxvar_sdriver = alloc_tty_driver(MXSER_PORTS);
-       if (!mxvar_sdriver)
-               return -ENOMEM;
+       mxvar_sdriver = tty_alloc_driver(MXSER_PORTS, TTY_DRIVER_REAL_RAW |
+                       TTY_DRIVER_DYNAMIC_DEV);
+       if (IS_ERR(mxvar_sdriver))
+               return PTR_ERR(mxvar_sdriver);
 
        /* Initialize the tty_driver structure */
        mxvar_sdriver->name = "ttyMI";
@@ -1988,7 +1989,6 @@ static int __init mxser_module_init(void)
        mxvar_sdriver->subtype = SERIAL_TYPE_NORMAL;
        mxvar_sdriver->init_termios = tty_std_termios;
        mxvar_sdriver->init_termios.c_cflag = B9600|CS8|CREAD|HUPCL|CLOCAL;
-       mxvar_sdriver->flags = TTY_DRIVER_REAL_RAW|TTY_DRIVER_DYNAMIC_DEV;
        tty_set_operations(mxvar_sdriver, &mxser_ops);
 
        retval = tty_register_driver(mxvar_sdriver);
@@ -2008,7 +2008,7 @@ static int __init mxser_module_init(void)
 err_unr:
        tty_unregister_driver(mxvar_sdriver);
 err_put:
-       put_tty_driver(mxvar_sdriver);
+       tty_driver_kref_put(mxvar_sdriver);
        return retval;
 }
 
@@ -2016,7 +2016,7 @@ static void __exit mxser_module_exit(void)
 {
        pci_unregister_driver(&mxser_driver);
        tty_unregister_driver(mxvar_sdriver);
-       put_tty_driver(mxvar_sdriver);
+       tty_driver_kref_put(mxvar_sdriver);
 }
 
 module_init(mxser_module_init);