aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/cyclades.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/tty/cyclades.c')
-rw-r--r--drivers/tty/cyclades.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
index c0e8f2eeb88..5beef494fc4 100644
--- a/drivers/tty/cyclades.c
+++ b/drivers/tty/cyclades.c
@@ -45,7 +45,6 @@
45#undef CY_DEBUG_IO 45#undef CY_DEBUG_IO
46#undef CY_DEBUG_COUNT 46#undef CY_DEBUG_COUNT
47#undef CY_DEBUG_DTR 47#undef CY_DEBUG_DTR
48#undef CY_DEBUG_WAIT_UNTIL_SENT
49#undef CY_DEBUG_INTERRUPTS 48#undef CY_DEBUG_INTERRUPTS
50#undef CY_16Y_HACK 49#undef CY_16Y_HACK
51#undef CY_ENABLE_MONITORING 50#undef CY_ENABLE_MONITORING
@@ -1678,16 +1677,10 @@ static void cy_wait_until_sent(struct tty_struct *tty, int timeout)
1678 */ 1677 */
1679 if (!timeout || timeout > 2 * info->timeout) 1678 if (!timeout || timeout > 2 * info->timeout)
1680 timeout = 2 * info->timeout; 1679 timeout = 2 * info->timeout;
1681#ifdef CY_DEBUG_WAIT_UNTIL_SENT 1680
1682 printk(KERN_DEBUG "In cy_wait_until_sent(%d) check=%d, jiff=%lu...",
1683 timeout, char_time, jiffies);
1684#endif
1685 card = info->card; 1681 card = info->card;
1686 if (!cy_is_Z(card)) { 1682 if (!cy_is_Z(card)) {
1687 while (cyy_readb(info, CySRER) & CyTxRdy) { 1683 while (cyy_readb(info, CySRER) & CyTxRdy) {
1688#ifdef CY_DEBUG_WAIT_UNTIL_SENT
1689 printk(KERN_DEBUG "Not clean (jiff=%lu)...", jiffies);
1690#endif
1691 if (msleep_interruptible(jiffies_to_msecs(char_time))) 1684 if (msleep_interruptible(jiffies_to_msecs(char_time)))
1692 break; 1685 break;
1693 if (timeout && time_after(jiffies, orig_jiffies + 1686 if (timeout && time_after(jiffies, orig_jiffies +
@@ -1697,9 +1690,6 @@ static void cy_wait_until_sent(struct tty_struct *tty, int timeout)
1697 } 1690 }
1698 /* Run one more char cycle */ 1691 /* Run one more char cycle */
1699 msleep_interruptible(jiffies_to_msecs(char_time * 5)); 1692 msleep_interruptible(jiffies_to_msecs(char_time * 5));
1700#ifdef CY_DEBUG_WAIT_UNTIL_SENT
1701 printk(KERN_DEBUG "Clean (jiff=%lu)...done\n", jiffies);
1702#endif
1703} 1693}
1704 1694
1705static void cy_flush_buffer(struct tty_struct *tty) 1695static void cy_flush_buffer(struct tty_struct *tty)