um: remove dead code

GCC 4.6's -Wunused-but-set-variable found some dead code.

Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 2 insertions, 4 deletions

diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
index 25e1965df7ce..d4191fe1cede 100644
--- a/arch/um/drivers/chan_kern.c
+++ b/arch/um/drivers/chan_kern.c
@@ -543,11 +543,10 @@ int parse_chan_pair(char *str, struct line *line, int device,
                     const struct chan_opts *opts, char **error_out)
 {
         struct list_head *chans = &line->chan_list;
-        struct chan *new, *chan;
+        struct chan *new;
         char *in, *out;
 
         if (!list_empty(chans)) {
-                chan = list_entry(chans->next, struct chan, list);
                 free_chan(chans, 0);
                 INIT_LIST_HEAD(chans);
         }
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index 35dd0b86401a..d51c404239a8 100644
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -176,10 +176,9 @@ void line_flush_buffer(struct tty_struct *tty)
 {
         struct line *line = tty->driver_data;
         unsigned long flags;
-        int err;
 
         spin_lock_irqsave(&line->lock, flags);
-        err = flush_buffer(line);
+        flush_buffer(line);
         spin_unlock_irqrestore(&line->lock, flags);
 }