lkml.org 
[lkml]   [2012]   [Jun]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 17/24] TTY: vt, remove con_schedule_flip
    Date
    This is identical to tty_schedule_flip. So let us use that instead.

    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/tty/vt/keyboard.c | 6 +++---
    drivers/tty/vt/vt.c | 2 +-
    include/linux/kbd_kern.h | 12 ------------
    3 files changed, 4 insertions(+), 16 deletions(-)

    diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
    index 48cc6f2..0b6217c 100644
    --- a/drivers/tty/vt/keyboard.c
    +++ b/drivers/tty/vt/keyboard.c
    @@ -310,7 +310,7 @@ static void put_queue(struct vc_data *vc, int ch)

    if (tty) {
    tty_insert_flip_char(tty, ch, 0);
    - con_schedule_flip(tty);
    + tty_schedule_flip(tty);
    }
    }

    @@ -325,7 +325,7 @@ static void puts_queue(struct vc_data *vc, char *cp)
    tty_insert_flip_char(tty, *cp, 0);
    cp++;
    }
    - con_schedule_flip(tty);
    + tty_schedule_flip(tty);
    }

    static void applkey(struct vc_data *vc, int key, char mode)
    @@ -586,7 +586,7 @@ static void fn_send_intr(struct vc_data *vc)
    if (!tty)
    return;
    tty_insert_flip_char(tty, 0, TTY_BREAK);
    - con_schedule_flip(tty);
    + tty_schedule_flip(tty);
    }

    static void fn_scroll_forw(struct vc_data *vc)
    diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
    index 84cbf29..88a4914 100644
    --- a/drivers/tty/vt/vt.c
    +++ b/drivers/tty/vt/vt.c
    @@ -1380,7 +1380,7 @@ static void respond_string(const char *p, struct tty_struct *tty)
    tty_insert_flip_char(tty, *p, 0);
    p++;
    }
    - con_schedule_flip(tty);
    + tty_schedule_flip(tty);
    }

    static void cursor_report(struct vc_data *vc, struct tty_struct *tty)
    diff --git a/include/linux/kbd_kern.h b/include/linux/kbd_kern.h
    index daf4a3a..af9137d 100644
    --- a/include/linux/kbd_kern.h
    +++ b/include/linux/kbd_kern.h
    @@ -145,16 +145,4 @@ void compute_shiftstate(void);

    extern unsigned int keymap_count;

    -/* console.c */
    -
    -static inline void con_schedule_flip(struct tty_struct *t)
    -{
    - unsigned long flags;
    - spin_lock_irqsave(&t->buf.lock, flags);
    - if (t->buf.tail != NULL)
    - t->buf.tail->commit = t->buf.tail->used;
    - spin_unlock_irqrestore(&t->buf.lock, flags);
    - schedule_work(&t->buf.work);
    -}
    -
    #endif
    --
    1.7.10.3



    \
     
     \ /
      Last update: 2012-06-04 15:44    [W:4.749 / U:0.424 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site