tty: drop put_tty_driver

[linux-2.6-microblaze.git] / drivers / usb / serial / usb-serial.c

diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index eeb441c..090a78c 100644 (file)
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -1319,9 +1319,10 @@ static int __init usb_serial_init(void)
 {
        int result;
 
-       usb_serial_tty_driver = alloc_tty_driver(USB_SERIAL_TTY_MINORS);
-       if (!usb_serial_tty_driver)
-               return -ENOMEM;
+       usb_serial_tty_driver = tty_alloc_driver(USB_SERIAL_TTY_MINORS,
+                       TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV);
+       if (IS_ERR(usb_serial_tty_driver))
+               return PTR_ERR(usb_serial_tty_driver);
 
        /* Initialize our global data */
        result = bus_register(&usb_serial_bus_type);
@@ -1336,8 +1337,6 @@ static int __init usb_serial_init(void)
        usb_serial_tty_driver->minor_start = 0;
        usb_serial_tty_driver->type = TTY_DRIVER_TYPE_SERIAL;
        usb_serial_tty_driver->subtype = SERIAL_TYPE_NORMAL;
-       usb_serial_tty_driver->flags = TTY_DRIVER_REAL_RAW |
-                                               TTY_DRIVER_DYNAMIC_DEV;
        usb_serial_tty_driver->init_termios = tty_std_termios;
        usb_serial_tty_driver->init_termios.c_cflag = B9600 | CS8 | CREAD
                                                        | HUPCL | CLOCAL;
@@ -1367,7 +1366,7 @@ exit_reg_driver:
 
 exit_bus:
        pr_err("%s - returning with error %d\n", __func__, result);
-       put_tty_driver(usb_serial_tty_driver);
+       tty_driver_kref_put(usb_serial_tty_driver);
        return result;
 }
 
@@ -1379,7 +1378,7 @@ static void __exit usb_serial_exit(void)
        usb_serial_generic_deregister();
 
        tty_unregister_driver(usb_serial_tty_driver);
-       put_tty_driver(usb_serial_tty_driver);
+       tty_driver_kref_put(usb_serial_tty_driver);
        bus_unregister(&usb_serial_bus_type);
        idr_destroy(&serial_minors);
 }