AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-24 17:20:50 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

TTY: mxser+cyclades remove wait_until_sent debug code

Browse Source 
It makes the code really ugly. And since it can be enabled only before
building and only in the source files, it can be barely used by users.
That said, I've not seen anybody to use it in the past few years.

This crap is copied to some more drivers over the tty tree. Since I'm
not their maintainer, I'm not sure if I should remove them too?

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jiri Slaby 2011-07-14 14:35:15 +02:00 committed by Greg Kroah-Hartman
parent 906cbe1364
commit 8bab534b50
2 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/tty/cyclades.c
View File

@ -45,7 +45,6 @@
#undef CY_DEBUG_IO #undef CY_DEBUG_IO
#undef CY_DEBUG_COUNT #undef CY_DEBUG_COUNT
#undef CY_DEBUG_DTR #undef CY_DEBUG_DTR
#undef CY_DEBUG_WAIT_UNTIL_SENT
#undef CY_DEBUG_INTERRUPTS #undef CY_DEBUG_INTERRUPTS
#undef CY_16Y_HACK #undef CY_16Y_HACK
#undef CY_ENABLE_MONITORING #undef CY_ENABLE_MONITORING
@ -1678,16 +1677,10 @@ static void cy_wait_until_sent(struct tty_struct *tty, int timeout)
*/ */
if (!timeout || timeout > 2 * info->timeout) if (!timeout || timeout > 2 * info->timeout)
timeout = 2 * info->timeout; timeout = 2 * info->timeout;
#ifdef CY_DEBUG_WAIT_UNTIL_SENT
printk(KERN_DEBUG "In cy_wait_until_sent(%d) check=%d, jiff=%lu...",
timeout, char_time, jiffies);
#endif
card = info->card; card = info->card;
if (!cy_is_Z(card)) { if (!cy_is_Z(card)) {
while (cyy_readb(info, CySRER) & CyTxRdy) { while (cyy_readb(info, CySRER) & CyTxRdy) {
#ifdef CY_DEBUG_WAIT_UNTIL_SENT
printk(KERN_DEBUG "Not clean (jiff=%lu)...", jiffies);
#endif
if (msleep_interruptible(jiffies_to_msecs(char_time))) if (msleep_interruptible(jiffies_to_msecs(char_time)))
break; break;
if (timeout && time_after(jiffies, orig_jiffies + if (timeout && time_after(jiffies, orig_jiffies +
@ -1697,9 +1690,6 @@ static void cy_wait_until_sent(struct tty_struct *tty, int timeout)
} }
/* Run one more char cycle */ /* Run one more char cycle */
msleep_interruptible(jiffies_to_msecs(char_time * 5)); msleep_interruptible(jiffies_to_msecs(char_time * 5));
#ifdef CY_DEBUG_WAIT_UNTIL_SENT
printk(KERN_DEBUG "Clean (jiff=%lu)...done\n", jiffies);
#endif
} }
static void cy_flush_buffer(struct tty_struct *tty) static void cy_flush_buffer(struct tty_struct *tty)

13
drivers/tty/mxser.c
View File

@ -2005,16 +2005,9 @@ static void mxser_wait_until_sent(struct tty_struct *tty, int timeout)
*/ */
if (!timeout || timeout > 2 * info->timeout) if (!timeout || timeout > 2 * info->timeout)
timeout = 2 * info->timeout; timeout = 2 * info->timeout;
#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
printk(KERN_DEBUG "In rs_wait_until_sent(%d) check=%lu...",
timeout, char_time);
printk("jiff=%lu...", jiffies);
#endif
spin_lock_irqsave(&info->slock, flags); spin_lock_irqsave(&info->slock, flags);
while (!((lsr = inb(info->ioaddr + UART_LSR)) & UART_LSR_TEMT)) { while (!((lsr = inb(info->ioaddr + UART_LSR)) & UART_LSR_TEMT)) {
#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
printk("lsr = %d (jiff=%lu)...", lsr, jiffies);
#endif
spin_unlock_irqrestore(&info->slock, flags); spin_unlock_irqrestore(&info->slock, flags);
schedule_timeout_interruptible(char_time); schedule_timeout_interruptible(char_time);
spin_lock_irqsave(&info->slock, flags); spin_lock_irqsave(&info->slock, flags);
@ -2025,10 +2018,6 @@ static void mxser_wait_until_sent(struct tty_struct *tty, int timeout)
} }
spin_unlock_irqrestore(&info->slock, flags); spin_unlock_irqrestore(&info->slock, flags);
set_current_state(TASK_RUNNING); set_current_state(TASK_RUNNING);
#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
printk("lsr = %d (jiff=%lu)...done\n", lsr, jiffies);
#endif
} }
/* /*