Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bab534b authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

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: default avatarJiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 906cbe13

drivers/tty/cyclades.c

+1 −11
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 
#undef	CY_DEBUG_IO

#undef	CY_DEBUG_COUNT

#undef	CY_DEBUG_DTR

#undef	CY_DEBUG_WAIT_UNTIL_SENT

#undef	CY_DEBUG_INTERRUPTS

#undef	CY_16Y_HACK

#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)

		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;

	if (!cy_is_Z(card)) {

		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)))

				break;

			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 */

	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)

drivers/tty/mxser.c

+1 −12
Original line number Diff line number Diff line
@@ -2005,16 +2005,9 @@ static void mxser_wait_until_sent(struct tty_struct *tty, int timeout) 
	 */

	if (!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);

	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);

		schedule_timeout_interruptible(char_time);

		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);

	set_current_state(TASK_RUNNING);



#ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT

	printk("lsr = %d (jiff=%lu)...done\n", lsr, jiffies);

#endif

}



/*