Commit 8e7d91c9 authored by Breno Leitao's avatar Breno Leitao Committed by Linus Torvalds

tty: jsm cleanups

Here are some cleanups, mainly removing unused variables and silly
declarations.
Signed-off-by: default avatarBreno Leitao <leitao@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAlan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 78d67b40
...@@ -533,7 +533,6 @@ static void neo_copy_data_from_queue_to_uart(struct jsm_channel *ch) ...@@ -533,7 +533,6 @@ static void neo_copy_data_from_queue_to_uart(struct jsm_channel *ch)
if (!(ch->ch_flags & (CH_TX_FIFO_EMPTY | CH_TX_FIFO_LWM))) if (!(ch->ch_flags & (CH_TX_FIFO_EMPTY | CH_TX_FIFO_LWM)))
return; return;
len_written = 0;
n = UART_17158_TX_FIFOSIZE - ch->ch_t_tlevel; n = UART_17158_TX_FIFOSIZE - ch->ch_t_tlevel;
/* cache head and tail of queue */ /* cache head and tail of queue */
...@@ -619,14 +618,10 @@ static void neo_parse_modem(struct jsm_channel *ch, u8 signals) ...@@ -619,14 +618,10 @@ static void neo_parse_modem(struct jsm_channel *ch, u8 signals)
/* Make the UART raise any of the output signals we want up */ /* Make the UART raise any of the output signals we want up */
static void neo_assert_modem_signals(struct jsm_channel *ch) static void neo_assert_modem_signals(struct jsm_channel *ch)
{ {
u8 out;
if (!ch) if (!ch)
return; return;
out = ch->ch_mostat; writeb(ch->ch_mostat, &ch->ch_neo_uart->mcr);
writeb(out, &ch->ch_neo_uart->mcr);
/* flush write operation */ /* flush write operation */
neo_pci_posting_flush(ch->ch_bd); neo_pci_posting_flush(ch->ch_bd);
...@@ -936,10 +931,9 @@ static inline void neo_parse_lsr(struct jsm_board *brd, u32 port) ...@@ -936,10 +931,9 @@ static inline void neo_parse_lsr(struct jsm_board *brd, u32 port)
static void neo_param(struct jsm_channel *ch) static void neo_param(struct jsm_channel *ch)
{ {
u8 lcr = 0; u8 lcr = 0;
u8 uart_lcr = 0; u8 uart_lcr, ier;
u8 ier = 0; u32 baud;
u32 baud = 9600; int quot;
int quot = 0;
struct jsm_board *bd; struct jsm_board *bd;
bd = ch->ch_bd; bd = ch->ch_bd;
......
...@@ -183,7 +183,6 @@ static void jsm_tty_break(struct uart_port *port, int break_state) ...@@ -183,7 +183,6 @@ static void jsm_tty_break(struct uart_port *port, int break_state)
static int jsm_tty_open(struct uart_port *port) static int jsm_tty_open(struct uart_port *port)
{ {
struct jsm_board *brd; struct jsm_board *brd;
int rc = 0;
struct jsm_channel *channel = (struct jsm_channel *)port; struct jsm_channel *channel = (struct jsm_channel *)port;
struct ktermios *termios; struct ktermios *termios;
...@@ -265,7 +264,7 @@ static int jsm_tty_open(struct uart_port *port) ...@@ -265,7 +264,7 @@ static int jsm_tty_open(struct uart_port *port)
channel->ch_open_count++; channel->ch_open_count++;
jsm_printk(OPEN, INFO, &channel->ch_bd->pci_dev, "finish\n"); jsm_printk(OPEN, INFO, &channel->ch_bd->pci_dev, "finish\n");
return rc; return 0;
} }
static void jsm_tty_close(struct uart_port *port) static void jsm_tty_close(struct uart_port *port)
...@@ -748,7 +747,7 @@ static void jsm_carrier(struct jsm_channel *ch) ...@@ -748,7 +747,7 @@ static void jsm_carrier(struct jsm_channel *ch)
void jsm_check_queue_flow_control(struct jsm_channel *ch) void jsm_check_queue_flow_control(struct jsm_channel *ch)
{ {
struct board_ops *bd_ops = ch->ch_bd->bd_ops; struct board_ops *bd_ops = ch->ch_bd->bd_ops;
int qleft = 0; int qleft;
/* Store how much space we have left in the queue */ /* Store how much space we have left in the queue */
if ((qleft = ch->ch_r_tail - ch->ch_r_head - 1) < 0) if ((qleft = ch->ch_r_tail - ch->ch_r_head - 1) < 0)
...@@ -834,7 +833,7 @@ void jsm_check_queue_flow_control(struct jsm_channel *ch) ...@@ -834,7 +833,7 @@ void jsm_check_queue_flow_control(struct jsm_channel *ch)
*/ */
int jsm_tty_write(struct uart_port *port) int jsm_tty_write(struct uart_port *port)
{ {
int bufcount = 0, n = 0; int bufcount;
int data_count = 0,data_count1 =0; int data_count = 0,data_count1 =0;
u16 head; u16 head;
u16 tail; u16 tail;
...@@ -850,14 +849,12 @@ int jsm_tty_write(struct uart_port *port) ...@@ -850,14 +849,12 @@ int jsm_tty_write(struct uart_port *port)
if ((bufcount = tail - head - 1) < 0) if ((bufcount = tail - head - 1) < 0)
bufcount += WQUEUESIZE; bufcount += WQUEUESIZE;
n = bufcount; bufcount = min(bufcount, 56);
n = min(n, 56);
remain = WQUEUESIZE - head; remain = WQUEUESIZE - head;
data_count = 0; data_count = 0;
if (n >= remain) { if (bufcount >= remain) {
n -= remain; bufcount -= remain;
while ((port->info->xmit.head != temp_tail) && while ((port->info->xmit.head != temp_tail) &&
(data_count < remain)) { (data_count < remain)) {
channel->ch_wqueue[head++] = channel->ch_wqueue[head++] =
...@@ -871,8 +868,8 @@ int jsm_tty_write(struct uart_port *port) ...@@ -871,8 +868,8 @@ int jsm_tty_write(struct uart_port *port)
} }
data_count1 = 0; data_count1 = 0;
if (n > 0) { if (bufcount > 0) {
remain = n; remain = bufcount;
while ((port->info->xmit.head != temp_tail) && while ((port->info->xmit.head != temp_tail) &&
(data_count1 < remain)) { (data_count1 < remain)) {
channel->ch_wqueue[head++] = channel->ch_wqueue[head++] =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment