1 files changed, 34 insertions, 124 deletions

diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
index ee0a549a933a..8f8814afce86 100644
--- a/drivers/isdn/gigaset/interface.c
+++ b/drivers/isdn/gigaset/interface.c
@@ -146,13 +146,10 @@ static const struct tty_operations if_ops = {
 static int if_open(struct tty_struct *tty, struct file *filp)
 {
         struct cardstate *cs;
-        unsigned long flags;
 
         gig_dbg(DEBUG_IF, "%d+%d: %s()",
                 tty->driver->minor_start, tty->index, __func__);
 
-        tty->driver_data = NULL;
-
         cs = gigaset_get_cs_by_tty(tty);
         if (!cs || !try_module_get(cs->driver->owner))
                 return -ENODEV;
@@ -163,12 +160,10 @@ static int if_open(struct tty_struct *tty, struct file *filp)
         }
         tty->driver_data = cs;
 
-        ++cs->open_count;
+        ++cs->port.count;
 
-        if (cs->open_count == 1) {
-                spin_lock_irqsave(&cs->lock, flags);
-                cs->tty = tty;
-                spin_unlock_irqrestore(&cs->lock, flags);
+        if (cs->port.count == 1) {
+                tty_port_tty_set(&cs->port, tty);
                 tty->low_latency = 1;
         }
 
@@ -178,12 +173,10 @@ static int if_open(struct tty_struct *tty, struct file *filp)
 
 static void if_close(struct tty_struct *tty, struct file *filp)
 {
-        struct cardstate *cs;
-        unsigned long flags;
+        struct cardstate *cs = tty->driver_data;
 
-        cs = (struct cardstate *) tty->driver_data;
-        if (!cs) {
-                pr_err("%s: no cardstate\n", __func__);
+        if (!cs) { /* happens if we didn't find cs in open */
+                printk(KERN_DEBUG "%s: no cardstate\n", __func__);
                 return;
         }
 
@@ -193,15 +186,10 @@ static void if_close(struct tty_struct *tty, struct file *filp)
 
         if (!cs->connected)
                 gig_dbg(DEBUG_IF, "not connected");     /* nothing to do */
-        else if (!cs->open_count)
+        else if (!cs->port.count)
                 dev_warn(cs->dev, "%s: device not opened\n", __func__);
-        else {
-                if (!--cs->open_count) {
-                        spin_lock_irqsave(&cs->lock, flags);
-                        cs->tty = NULL;
-                        spin_unlock_irqrestore(&cs->lock, flags);
-                }
-        }
+        else if (!--cs->port.count)
+                tty_port_tty_set(&cs->port, NULL);
 
         mutex_unlock(&cs->mutex);
 
@@ -211,18 +199,12 @@ static void if_close(struct tty_struct *tty, struct file *filp)
 static int if_ioctl(struct tty_struct *tty,
                     unsigned int cmd, unsigned long arg)
 {
-        struct cardstate *cs;
+        struct cardstate *cs = tty->driver_data;
         int retval = -ENODEV;
         int int_arg;
         unsigned char buf[6];
         unsigned version[4];
 
-        cs = (struct cardstate *) tty->driver_data;
-        if (!cs) {
-                pr_err("%s: no cardstate\n", __func__);
-                return -ENODEV;
-        }
-
         gig_dbg(DEBUG_IF, "%u: %s(0x%x)", cs->minor_index, __func__, cmd);
 
         if (mutex_lock_interruptible(&cs->mutex))
@@ -231,9 +213,7 @@ static int if_ioctl(struct tty_struct *tty,
         if (!cs->connected) {
                 gig_dbg(DEBUG_IF, "not connected");
                 retval = -ENODEV;
-        } else if (!cs->open_count)
-                dev_warn(cs->dev, "%s: device not opened\n", __func__);
-        else {
+        } else {
                 retval = 0;
                 switch (cmd) {
                 case GIGASET_REDIR:
@@ -285,15 +265,9 @@ static int if_ioctl(struct tty_struct *tty,
 
 static int if_tiocmget(struct tty_struct *tty)
 {
-        struct cardstate *cs;
+        struct cardstate *cs = tty->driver_data;
         int retval;
 
-        cs = (struct cardstate *) tty->driver_data;
-        if (!cs) {
-                pr_err("%s: no cardstate\n", __func__);
-                return -ENODEV;
-        }
-
         gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
 
         if (mutex_lock_interruptible(&cs->mutex))
@@ -309,16 +283,10 @@ static int if_tiocmget(struct tty_struct *tty)
 static int if_tiocmset(struct tty_struct *tty,
                        unsigned int set, unsigned int clear)
 {
-        struct cardstate *cs;
+        struct cardstate *cs = tty->driver_data;
         int retval;
         unsigned mc;
 
-        cs = (struct cardstate *) tty->driver_data;
-        if (!cs) {
-                pr_err("%s: no cardstate\n", __func__);
-                return -ENODEV;
-        }
-
         gig_dbg(DEBUG_IF, "%u: %s(0x%x, 0x%x)",
                 cs->minor_index, __func__, set, clear);
 
@@ -341,16 +309,10 @@ static int if_tiocmset(struct tty_struct *tty,
 
 static int if_write(struct tty_struct *tty, const unsigned char *buf, int count)
 {
-        struct cardstate *cs;
+        struct cardstate *cs = tty->driver_data;
         struct cmdbuf_t *cb;
         int retval;
 
-        cs = (struct cardstate *) tty->driver_data;
-        if (!cs) {
-                pr_err("%s: no cardstate\n", __func__);
-                return -ENODEV;
-        }
-
         gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
 
         if (mutex_lock_interruptible(&cs->mutex))
@@ -361,11 +323,6 @@ static int if_write(struct tty_struct *tty, const unsigned char *buf, int count)
                 retval = -ENODEV;
                 goto done;
         }
-        if (!cs->open_count) {
-                dev_warn(cs->dev, "%s: device not opened\n", __func__);
-                retval = -ENODEV;
-                goto done;
-        }
         if (cs->mstate != MS_LOCKED) {
                 dev_warn(cs->dev, "can't write to unlocked device\n");
                 retval = -EBUSY;
@@ -397,15 +354,9 @@ done:
 
 static int if_write_room(struct tty_struct *tty)
 {
-        struct cardstate *cs;
+        struct cardstate *cs = tty->driver_data;
         int retval = -ENODEV;
 
-        cs = (struct cardstate *) tty->driver_data;
-        if (!cs) {
-                pr_err("%s: no cardstate\n", __func__);
-                return -ENODEV;
-        }
-
         gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
 
         if (mutex_lock_interruptible(&cs->mutex))
@@ -414,9 +365,7 @@ static int if_write_room(struct tty_struct *tty)
         if (!cs->connected) {
                 gig_dbg(DEBUG_IF, "not connected");
                 retval = -ENODEV;
-        } else if (!cs->open_count)
-                dev_warn(cs->dev, "%s: device not opened\n", __func__);
-        else if (cs->mstate != MS_LOCKED) {
+        } else if (cs->mstate != MS_LOCKED) {
                 dev_warn(cs->dev, "can't write to unlocked device\n");
                 retval = -EBUSY;
         } else
@@ -429,23 +378,15 @@ static int if_write_room(struct tty_struct *tty)
 
 static int if_chars_in_buffer(struct tty_struct *tty)
 {
-        struct cardstate *cs;
+        struct cardstate *cs = tty->driver_data;
         int retval = 0;
 
-        cs = (struct cardstate *) tty->driver_data;
-        if (!cs) {
-                pr_err("%s: no cardstate\n", __func__);
-                return 0;
-        }
-
         gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
 
         mutex_lock(&cs->mutex);
 
         if (!cs->connected)
                 gig_dbg(DEBUG_IF, "not connected");
-        else if (!cs->open_count)
-                dev_warn(cs->dev, "%s: device not opened\n", __func__);
         else if (cs->mstate != MS_LOCKED)
                 dev_warn(cs->dev, "can't write to unlocked device\n");
         else
@@ -458,13 +399,7 @@ static int if_chars_in_buffer(struct tty_struct *tty)
 
 static void if_throttle(struct tty_struct *tty)
 {
-        struct cardstate *cs;
-
-        cs = (struct cardstate *) tty->driver_data;
-        if (!cs) {
-                pr_err("%s: no cardstate\n", __func__);
-                return;
-        }
+        struct cardstate *cs = tty->driver_data;
 
         gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
 
@@ -472,8 +407,6 @@ static void if_throttle(struct tty_struct *tty)
 
         if (!cs->connected)
                 gig_dbg(DEBUG_IF, "not connected");     /* nothing to do */
-        else if (!cs->open_count)
-                dev_warn(cs->dev, "%s: device not opened\n", __func__);
         else
                 gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
 
@@ -482,13 +415,7 @@ static void if_throttle(struct tty_struct *tty)
 
 static void if_unthrottle(struct tty_struct *tty)
 {
-        struct cardstate *cs;
-
-        cs = (struct cardstate *) tty->driver_data;
-        if (!cs) {
-                pr_err("%s: no cardstate\n", __func__);
-                return;
-        }
+        struct cardstate *cs = tty->driver_data;
 
         gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
 
@@ -496,8 +423,6 @@ static void if_unthrottle(struct tty_struct *tty)
 
         if (!cs->connected)
                 gig_dbg(DEBUG_IF, "not connected");     /* nothing to do */
-        else if (!cs->open_count)
-                dev_warn(cs->dev, "%s: device not opened\n", __func__);
         else
                 gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
 
@@ -506,18 +431,12 @@ static void if_unthrottle(struct tty_struct *tty)
 
 static void if_set_termios(struct tty_struct *tty, struct ktermios *old)
 {
-        struct cardstate *cs;
+        struct cardstate *cs = tty->driver_data;
         unsigned int iflag;
         unsigned int cflag;
         unsigned int old_cflag;
         unsigned int control_state, new_state;
 
-        cs = (struct cardstate *) tty->driver_data;
-        if (!cs) {
-                pr_err("%s: no cardstate\n", __func__);
-                return;
-        }
-
         gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
 
         mutex_lock(&cs->mutex);
@@ -527,11 +446,6 @@ static void if_set_termios(struct tty_struct *tty, struct ktermios *old)
                 goto out;
         }
 
-        if (!cs->open_count) {
-                dev_warn(cs->dev, "%s: device not opened\n", __func__);
-                goto out;
-        }
-
         iflag = tty->termios->c_iflag;
         cflag = tty->termios->c_cflag;
         old_cflag = old ? old->c_cflag : cflag;
@@ -588,10 +502,13 @@ out:
 /* wakeup tasklet for the write operation */
 static void if_wake(unsigned long data)
 {
-        struct cardstate *cs = (struct cardstate *) data;
+        struct cardstate *cs = (struct cardstate *)data;
+        struct tty_struct *tty = tty_port_tty_get(&cs->port);
 
-        if (cs->tty)
-                tty_wakeup(cs->tty);
+        if (tty) {
+                tty_wakeup(tty);
+                tty_kref_put(tty);
+        }
 }
 
 /*** interface to common ***/
@@ -644,18 +561,16 @@ void gigaset_if_free(struct cardstate *cs)
 void gigaset_if_receive(struct cardstate *cs,
                         unsigned char *buffer, size_t len)
 {
-        unsigned long flags;
-        struct tty_struct *tty;
+        struct tty_struct *tty = tty_port_tty_get(&cs->port);
 
-        spin_lock_irqsave(&cs->lock, flags);
-        tty = cs->tty;
-        if (tty == NULL)
+        if (tty == NULL) {
                 gig_dbg(DEBUG_IF, "receive on closed device");
-        else {
-                tty_insert_flip_string(tty, buffer, len);
-                tty_flip_buffer_push(tty);
+                return;
         }
-        spin_unlock_irqrestore(&cs->lock, flags);
+
+        tty_insert_flip_string(tty, buffer, len);
+        tty_flip_buffer_push(tty);
+        tty_kref_put(tty);
 }
 EXPORT_SYMBOL_GPL(gigaset_if_receive);
 
@@ -669,17 +584,15 @@ EXPORT_SYMBOL_GPL(gigaset_if_receive);
 void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
                            const char *devname)
 {
-        unsigned minors = drv->minors;
         int ret;
         struct tty_driver *tty;
 
         drv->have_tty = 0;
 
-        drv->tty = tty = alloc_tty_driver(minors);
+        drv->tty = tty = alloc_tty_driver(drv->minors);
         if (tty == NULL)
                 goto enomem;
 
-        tty->magic =            TTY_DRIVER_MAGIC,
         tty->type =             TTY_DRIVER_TYPE_SERIAL,
         tty->subtype =          SERIAL_TYPE_NORMAL,
         tty->flags =            TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
@@ -687,9 +600,6 @@ void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
         tty->driver_name =      procname;
         tty->name =             devname;
         tty->minor_start =      drv->minor;
-        tty->num =              drv->minors;
-
-        tty->owner =            THIS_MODULE;
 
         tty->init_termios          = tty_std_termios;
         tty->init_termios.c_cflag  = B9600 | CS8 | CREAD | HUPCL | CLOCAL;