From 46bc8862295f7640c03249a9cadccc5a0e2d2e67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Breno=20Leit=C3=A3o?= <leitao@linux.vnet.ibm.com>
Date: Tue, 29 Sep 2009 15:16:56 -0300
Subject: [PATCH] --- yaml --- r: 175311 b: refs/heads/master c:
 cead486f407bbf152feccfe3734dd3966f9ff166 h: refs/heads/master i:   175309:
 d59045854df2d1107547d94aa8998ea3e11da561   175307:
 09f4c1618c73b4ef5a81204b4be028aaa0ce8a85   175303:
 edd37c0ad42303bd4f6a417d735a5c70df3e23df   175295:
 9f4303b5d456fd34ec8ecb80102530fe1471890a v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/serial/jsm/jsm.h     | 2 --
 trunk/drivers/serial/jsm/jsm_neo.c | 2 --
 trunk/drivers/serial/jsm/jsm_tty.c | 2 --
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 8559a36d4132..332643c8a639 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a53568a22adf6881183096d0863b0ff301173cbd
+refs/heads/master: cead486f407bbf152feccfe3734dd3966f9ff166
diff --git a/trunk/drivers/serial/jsm/jsm.h b/trunk/drivers/serial/jsm/jsm.h
index afcbee24a6b2..d413e4a6aa9b 100644
--- a/trunk/drivers/serial/jsm/jsm.h
+++ b/trunk/drivers/serial/jsm/jsm.h
@@ -215,8 +215,6 @@ struct jsm_channel {
 	u8		ch_stopc;	/* Stop character		*/
 	u8		ch_startc;	/* Start character		*/
 
-	u32		ch_old_baud;	/* Cache of the current baud */
-
 	u32		ch_wopen;	/* Waiting for open process cnt */
 
 	u8		ch_mostat;	/* FEP output modem status	*/
diff --git a/trunk/drivers/serial/jsm/jsm_neo.c b/trunk/drivers/serial/jsm/jsm_neo.c
index 088e702ef5f3..bee37274cc9a 100644
--- a/trunk/drivers/serial/jsm/jsm_neo.c
+++ b/trunk/drivers/serial/jsm/jsm_neo.c
@@ -954,7 +954,6 @@ static void neo_param(struct jsm_channel *ch)
 		ch->ch_flags |= (CH_BAUD0);
 		ch->ch_mostat &= ~(UART_MCR_RTS | UART_MCR_DTR);
 		neo_assert_modem_signals(ch);
-		ch->ch_old_baud = 0;
 		return;
 
 	} else {
@@ -1041,7 +1040,6 @@ static void neo_param(struct jsm_channel *ch)
 	quot = ch->ch_bd->bd_dividend / baud;
 
 	if (quot != 0) {
-		ch->ch_old_baud = baud;
 		writeb(UART_LCR_DLAB, &ch->ch_neo_uart->lcr);
 		writeb((quot & 0xff), &ch->ch_neo_uart->txrx);
 		writeb((quot >> 8), &ch->ch_neo_uart->ier);
diff --git a/trunk/drivers/serial/jsm/jsm_tty.c b/trunk/drivers/serial/jsm/jsm_tty.c
index 6423dfb825f4..1bcad596f3d6 100644
--- a/trunk/drivers/serial/jsm/jsm_tty.c
+++ b/trunk/drivers/serial/jsm/jsm_tty.c
@@ -296,8 +296,6 @@ static void jsm_tty_close(struct uart_port *port)
 		bd->bd_ops->assert_modem_signals(channel);
 	}
 
-	channel->ch_old_baud = 0;
-
 	/* Turn off UART interrupts for this port */
 	channel->ch_bd->bd_ops->uart_off(channel);