tty: stop using alloc_tty_driver

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

diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
index e3a5a5b..d24404c 100644 (file)
--- a/drivers/tty/ipwireless/tty.c
+++ b/drivers/tty/ipwireless/tty.c
@@ -564,9 +564,10 @@ int ipwireless_tty_init(void)
 {
        int result;
 
-       ipw_tty_driver = alloc_tty_driver(IPWIRELESS_PCMCIA_MINORS);
-       if (!ipw_tty_driver)
-               return -ENOMEM;
+       ipw_tty_driver = tty_alloc_driver(IPWIRELESS_PCMCIA_MINORS,
+                       TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV);
+       if (IS_ERR(ipw_tty_driver))
+               return PTR_ERR(ipw_tty_driver);
 
        ipw_tty_driver->driver_name = IPWIRELESS_PCCARD_NAME;
        ipw_tty_driver->name = "ttyIPWp";
@@ -574,7 +575,6 @@ int ipwireless_tty_init(void)
        ipw_tty_driver->minor_start = IPWIRELESS_PCMCIA_START;
        ipw_tty_driver->type = TTY_DRIVER_TYPE_SERIAL;
        ipw_tty_driver->subtype = SERIAL_TYPE_NORMAL;
-       ipw_tty_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
        ipw_tty_driver->init_termios = tty_std_termios;
        ipw_tty_driver->init_termios.c_cflag =
            B9600 | CS8 | CREAD | HUPCL | CLOCAL;