diff options
author | Breno Leitão <leitao@linux.vnet.ibm.com> | 2009-09-29 14:16:56 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 18:18:02 -0500 |
commit | cead486f407bbf152feccfe3734dd3966f9ff166 (patch) | |
tree | 258cb4af57edcf0814bf0940330e3cfde86dec20 | |
parent | a53568a22adf6881183096d0863b0ff301173cbd (diff) |
jsm: removing ch_old_baud field
Currently the field jsm_channel->ch_old_baud is not used, just
assigned in a lot of places but never used. This patches removes
this field.
Signed-off-by: Breno Leitão <leitao@linux.vnet.ibm.com>
Cc: Scott Kilau <scottk@digi.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/serial/jsm/jsm.h | 2 | ||||
-rw-r--r-- | drivers/serial/jsm/jsm_neo.c | 2 | ||||
-rw-r--r-- | drivers/serial/jsm/jsm_tty.c | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/drivers/serial/jsm/jsm.h b/drivers/serial/jsm/jsm.h index afcbee24a6b2..d413e4a6aa9b 100644 --- a/drivers/serial/jsm/jsm.h +++ b/drivers/serial/jsm/jsm.h | |||
@@ -215,8 +215,6 @@ struct jsm_channel { | |||
215 | u8 ch_stopc; /* Stop character */ | 215 | u8 ch_stopc; /* Stop character */ |
216 | u8 ch_startc; /* Start character */ | 216 | u8 ch_startc; /* Start character */ |
217 | 217 | ||
218 | u32 ch_old_baud; /* Cache of the current baud */ | ||
219 | |||
220 | u32 ch_wopen; /* Waiting for open process cnt */ | 218 | u32 ch_wopen; /* Waiting for open process cnt */ |
221 | 219 | ||
222 | u8 ch_mostat; /* FEP output modem status */ | 220 | u8 ch_mostat; /* FEP output modem status */ |
diff --git a/drivers/serial/jsm/jsm_neo.c b/drivers/serial/jsm/jsm_neo.c index 088e702ef5f3..bee37274cc9a 100644 --- a/drivers/serial/jsm/jsm_neo.c +++ b/drivers/serial/jsm/jsm_neo.c | |||
@@ -954,7 +954,6 @@ static void neo_param(struct jsm_channel *ch) | |||
954 | ch->ch_flags |= (CH_BAUD0); | 954 | ch->ch_flags |= (CH_BAUD0); |
955 | ch->ch_mostat &= ~(UART_MCR_RTS | UART_MCR_DTR); | 955 | ch->ch_mostat &= ~(UART_MCR_RTS | UART_MCR_DTR); |
956 | neo_assert_modem_signals(ch); | 956 | neo_assert_modem_signals(ch); |
957 | ch->ch_old_baud = 0; | ||
958 | return; | 957 | return; |
959 | 958 | ||
960 | } else { | 959 | } else { |
@@ -1041,7 +1040,6 @@ static void neo_param(struct jsm_channel *ch) | |||
1041 | quot = ch->ch_bd->bd_dividend / baud; | 1040 | quot = ch->ch_bd->bd_dividend / baud; |
1042 | 1041 | ||
1043 | if (quot != 0) { | 1042 | if (quot != 0) { |
1044 | ch->ch_old_baud = baud; | ||
1045 | writeb(UART_LCR_DLAB, &ch->ch_neo_uart->lcr); | 1043 | writeb(UART_LCR_DLAB, &ch->ch_neo_uart->lcr); |
1046 | writeb((quot & 0xff), &ch->ch_neo_uart->txrx); | 1044 | writeb((quot & 0xff), &ch->ch_neo_uart->txrx); |
1047 | writeb((quot >> 8), &ch->ch_neo_uart->ier); | 1045 | writeb((quot >> 8), &ch->ch_neo_uart->ier); |
diff --git a/drivers/serial/jsm/jsm_tty.c b/drivers/serial/jsm/jsm_tty.c index 6423dfb825f4..1bcad596f3d6 100644 --- a/drivers/serial/jsm/jsm_tty.c +++ b/drivers/serial/jsm/jsm_tty.c | |||
@@ -296,8 +296,6 @@ static void jsm_tty_close(struct uart_port *port) | |||
296 | bd->bd_ops->assert_modem_signals(channel); | 296 | bd->bd_ops->assert_modem_signals(channel); |
297 | } | 297 | } |
298 | 298 | ||
299 | channel->ch_old_baud = 0; | ||
300 | |||
301 | /* Turn off UART interrupts for this port */ | 299 | /* Turn off UART interrupts for this port */ |
302 | channel->ch_bd->bd_ops->uart_off(channel); | 300 | channel->ch_bd->bd_ops->uart_off(channel); |
303 | 301 | ||