aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/mxser.c
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2011-07-14 08:35:15 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-23 13:34:07 -0400
commit8bab534b508230f33be5f7ba8492923754274a8d (patch)
treef56ea996607141b07f0f42cc3a2156c5d5335269 /drivers/tty/mxser.c
parent906cbe1364d94da7cbf74c1d05e3e78b2883f661 (diff)
TTY: mxser+cyclades remove wait_until_sent debug code
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>
Diffstat (limited to 'drivers/tty/mxser.c')
-rw-r--r--drivers/tty/mxser.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index 7fc8c02fea6c..8998d527232a 100644
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c
@@ -2005,16 +2005,9 @@ static void mxser_wait_until_sent(struct tty_struct *tty, int timeout)
2005 */ 2005 */
2006 if (!timeout || timeout > 2 * info->timeout) 2006 if (!timeout || timeout > 2 * info->timeout)
2007 timeout = 2 * info->timeout; 2007 timeout = 2 * info->timeout;
2008#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT 2008
2009 printk(KERN_DEBUG "In rs_wait_until_sent(%d) check=%lu...",
2010 timeout, char_time);
2011 printk("jiff=%lu...", jiffies);
2012#endif
2013 spin_lock_irqsave(&info->slock, flags); 2009 spin_lock_irqsave(&info->slock, flags);
2014 while (!((lsr = inb(info->ioaddr + UART_LSR)) & UART_LSR_TEMT)) { 2010 while (!((lsr = inb(info->ioaddr + UART_LSR)) & UART_LSR_TEMT)) {
2015#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
2016 printk("lsr = %d (jiff=%lu)...", lsr, jiffies);
2017#endif
2018 spin_unlock_irqrestore(&info->slock, flags); 2011 spin_unlock_irqrestore(&info->slock, flags);
2019 schedule_timeout_interruptible(char_time); 2012 schedule_timeout_interruptible(char_time);
2020 spin_lock_irqsave(&info->slock, flags); 2013 spin_lock_irqsave(&info->slock, flags);
@@ -2025,10 +2018,6 @@ static void mxser_wait_until_sent(struct tty_struct *tty, int timeout)
2025 } 2018 }
2026 spin_unlock_irqrestore(&info->slock, flags); 2019 spin_unlock_irqrestore(&info->slock, flags);
2027 set_current_state(TASK_RUNNING); 2020 set_current_state(TASK_RUNNING);
2028
2029#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
2030 printk("lsr = %d (jiff=%lu)...done\n", lsr, jiffies);
2031#endif
2032} 2021}
2033 2022
2034/* 2023/*