From f069433b38610cd72b9b383f1c96bf05a5c7eb47 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Thu, 18 Oct 2007 03:06:02 -0700
Subject: [PATCH] --- yaml --- r: 71167 b: refs/heads/master c:
 0678c5b679db7abe8b8d658127e0fed4ceece41c h: refs/heads/master i:   71165:
 6c2787d50e3586ece5a799b90c5a55658967b382   71163:
 bd2103c062c55a5006fe0e83115356658abde3a0   71159:
 3f6d1a12c46cfa7795c6af01819965c10a7ff133   71151:
 fffb55272b2005e76255792a5802dc6431097c30   71135:
 080c9a034b55cdb6157e5b225efda4307343330d   71103:
 616683540e0e0600d0c42553cdc2b09fec40d2ea   71039:
 0581a9e7f08ba6ad733e626d2ac7fd03185298b4   70911:
 47c2e5fc20088536f3bc8aaeeb4701d2be2d8eb2   70655:
 8cebdcc8a85483c6e710809fdb4e9f12dcac0e69 v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/char/mxser.c | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 9565df9dd4f5..ab995151eb38 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 009ae1dbd57569418ab4f7ae7c8864efa3ac7e4a
+refs/heads/master: 0678c5b679db7abe8b8d658127e0fed4ceece41c
diff --git a/trunk/drivers/char/mxser.c b/trunk/drivers/char/mxser.c
index 2aee3fef0416..a24738e85fb8 100644
--- a/trunk/drivers/char/mxser.c
+++ b/trunk/drivers/char/mxser.c
@@ -1938,14 +1938,6 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id)
 				inb(info->base + UART_MSR);
 				continue;
 			}
-			/* above add by Victor Yu. 09-13-2002 */
-			/*
-			   if (info->tty->flip.count < TTY_FLIPBUF_SIZE / 4) {
-			   info->IER |= MOXA_MUST_RECV_ISR;
-			   outb(info->IER, info->base + UART_IER);
-			   }
-			 */
-
 
 			/* mask by Victor Yu. 09-13-2002
 			   if ( !info->tty ||
@@ -2599,19 +2591,8 @@ static int mxser_change_speed(struct mxser_struct *info, struct ktermios *old_te
 		info->IER |= UART_IER_MSI;
 		if ((info->type == PORT_16550A) || (info->IsMoxaMustChipFlag)) {
 			info->MCR |= UART_MCR_AFE;
-			/* status = mxser_get_msr(info->base, 0, info->port); */
-/*
-	save_flags(flags);
-	cli();
-	status = inb(baseaddr + UART_MSR);
-	restore_flags(flags);
-*/
-			/* mxser_check_modem_status(info, status); */
 		} else {
-			/* status = mxser_get_msr(info->base, 0, info->port); */
-			/* MX_LOCK(&info->slock); */
 			status = inb(info->base + UART_MSR);
-			/* MX_UNLOCK(&info->slock); */
 			if (info->tty->hw_stopped) {
 				if (status & UART_MSR_CTS) {
 					info->tty->hw_stopped = 0;