Merge tag 'xtensa-20210902' of git://github.com/jcmvbkbc/linux-xtensa

[linux-2.6-microblaze.git] / arch / xtensa / platforms / iss / console.c

diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c
index 2118448..81d7c7e 100644 (file)
--- a/arch/xtensa/platforms/iss/console.c
+++ b/arch/xtensa/platforms/iss/console.c
@@ -136,28 +136,41 @@ static const struct tty_operations serial_ops = {
 
 static int __init rs_init(void)
 {
-       tty_port_init(&serial_port);
+       struct tty_driver *driver;
+       int ret;
+
+       driver = tty_alloc_driver(SERIAL_MAX_NUM_LINES, TTY_DRIVER_REAL_RAW);
+       if (IS_ERR(driver))
+               return PTR_ERR(driver);
 
-       serial_driver = alloc_tty_driver(SERIAL_MAX_NUM_LINES);
+       tty_port_init(&serial_port);
 
        /* Initialize the tty_driver structure */
 
-       serial_driver->driver_name = "iss_serial";
-       serial_driver->name = "ttyS";
-       serial_driver->major = TTY_MAJOR;
-       serial_driver->minor_start = 64;
-       serial_driver->type = TTY_DRIVER_TYPE_SERIAL;
-       serial_driver->subtype = SERIAL_TYPE_NORMAL;
-       serial_driver->init_termios = tty_std_termios;
-       serial_driver->init_termios.c_cflag =
+       driver->driver_name = "iss_serial";
+       driver->name = "ttyS";
+       driver->major = TTY_MAJOR;
+       driver->minor_start = 64;
+       driver->type = TTY_DRIVER_TYPE_SERIAL;
+       driver->subtype = SERIAL_TYPE_NORMAL;
+       driver->init_termios = tty_std_termios;
+       driver->init_termios.c_cflag =
                B9600 | CS8 | CREAD | HUPCL | CLOCAL;
-       serial_driver->flags = TTY_DRIVER_REAL_RAW;
 
-       tty_set_operations(serial_driver, &serial_ops);
-       tty_port_link_device(&serial_port, serial_driver, 0);
+       tty_set_operations(driver, &serial_ops);
+       tty_port_link_device(&serial_port, driver, 0);
+
+       ret = tty_register_driver(driver);
+       if (ret) {
+               pr_err("Couldn't register serial driver\n");
+               tty_driver_kref_put(driver);
+               tty_port_destroy(&serial_port);
+
+               return ret;
+       }
+
+       serial_driver = driver;
 
-       if (tty_register_driver(serial_driver))
-               panic("Couldn't register serial driver\n");
        return 0;
 }
 
@@ -165,7 +178,7 @@ static int __init rs_init(void)
 static __exit void rs_exit(void)
 {
        tty_unregister_driver(serial_driver);
-       put_tty_driver(serial_driver);
+       tty_driver_kref_put(serial_driver);
        tty_port_destroy(&serial_port);
 }
 
@@ -186,10 +199,10 @@ late_initcall(rs_init);
 
 static void iss_console_write(struct console *co, const char *s, unsigned count)
 {
-       int len = strlen(s);
-
-       if (s != 0 && *s != 0)
+       if (s && *s != 0) {
+               int len = strlen(s);
                simc_write(1, s, count < len ? count : len);
+       }
 }
 
 static struct tty_driver* iss_console_device(struct console *c, int *index)