aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/nozomi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/tty/nozomi.c')
-rw-r--r--drivers/tty/nozomi.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c
index c34d622dace4..b1aecc7bb32a 100644
--- a/drivers/tty/nozomi.c
+++ b/drivers/tty/nozomi.c
@@ -364,8 +364,6 @@ struct port {
364 u8 toggle_ul; 364 u8 toggle_ul;
365 u16 token_dl; 365 u16 token_dl;
366 366
367 /* mutex to ensure one access patch to this port */
368 struct mutex tty_sem;
369 wait_queue_head_t tty_wait; 367 wait_queue_head_t tty_wait;
370 struct async_icount tty_icount; 368 struct async_icount tty_icount;
371 369
@@ -1474,7 +1472,6 @@ static int __devinit nozomi_card_init(struct pci_dev *pdev,
1474 struct device *tty_dev; 1472 struct device *tty_dev;
1475 struct port *port = &dc->port[i]; 1473 struct port *port = &dc->port[i];
1476 port->dc = dc; 1474 port->dc = dc;
1477 mutex_init(&port->tty_sem);
1478 tty_port_init(&port->port); 1475 tty_port_init(&port->port);
1479 port->port.ops = &noz_tty_port_ops; 1476 port->port.ops = &noz_tty_port_ops;
1480 tty_dev = tty_register_device(ntty_driver, dc->index_start + i, 1477 tty_dev = tty_register_device(ntty_driver, dc->index_start + i,
@@ -1688,8 +1685,6 @@ static int ntty_write(struct tty_struct *tty, const unsigned char *buffer,
1688 if (!dc || !port) 1685 if (!dc || !port)
1689 return -ENODEV; 1686 return -ENODEV;
1690 1687
1691 mutex_lock(&port->tty_sem);
1692
1693 rval = kfifo_in(&port->fifo_ul, (unsigned char *)buffer, count); 1688 rval = kfifo_in(&port->fifo_ul, (unsigned char *)buffer, count);
1694 1689
1695 /* notify card */ 1690 /* notify card */
@@ -1714,7 +1709,6 @@ static int ntty_write(struct tty_struct *tty, const unsigned char *buffer,
1714 spin_unlock_irqrestore(&dc->spin_mutex, flags); 1709 spin_unlock_irqrestore(&dc->spin_mutex, flags);
1715 1710
1716exit: 1711exit:
1717 mutex_unlock(&port->tty_sem);
1718 return rval; 1712 return rval;
1719} 1713}
1720 1714
@@ -1733,11 +1727,9 @@ static int ntty_write_room(struct tty_struct *tty)
1733 int room = 4096; 1727 int room = 4096;
1734 const struct nozomi *dc = get_dc_by_tty(tty); 1728 const struct nozomi *dc = get_dc_by_tty(tty);
1735 1729
1736 if (dc) { 1730 if (dc)
1737 mutex_lock(&port->tty_sem);
1738 room = kfifo_avail(&port->fifo_ul); 1731 room = kfifo_avail(&port->fifo_ul);
1739 mutex_unlock(&port->tty_sem); 1732
1740 }
1741 return room; 1733 return room;
1742} 1734}
1743 1735