Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 4 insertions, 10 deletions

diff --git a/drivers/serial/jsm/jsm_neo.c b/drivers/serial/jsm/jsm_neo.c
index e6390d023634..9dadaa11d266 100644
--- a/drivers/serial/jsm/jsm_neo.c
+++ b/drivers/serial/jsm/jsm_neo.c
@@ -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)))
                 return;
 
-        len_written = 0;
         n = UART_17158_TX_FIFOSIZE - ch->ch_t_tlevel;
 
         /* cache head and tail of queue */
@@ -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 */
 static void neo_assert_modem_signals(struct jsm_channel *ch)
 {
-        u8 out;
-
         if (!ch)
                 return;
 
-        out = ch->ch_mostat;
-
-        writeb(out, &ch->ch_neo_uart->mcr);
+        writeb(ch->ch_mostat, &ch->ch_neo_uart->mcr);
 
         /* flush write operation */
         neo_pci_posting_flush(ch->ch_bd);
@@ -936,10 +931,9 @@ static inline void neo_parse_lsr(struct jsm_board *brd, u32 port)
 static void neo_param(struct jsm_channel *ch)
 {
         u8 lcr = 0;
-        u8 uart_lcr = 0;
-        u8 ier = 0;
-        u32 baud = 9600;
-        int quot = 0;
+        u8 uart_lcr, ier;
+        u32 baud;
+        int quot;
         struct jsm_board *bd;
 
         bd = ch->ch_bd;