lkml.org 
[lkml]   [2009]   [Nov]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 11/12] moxa: Kill the use of lock_kernel
    Date
    It isn't needed here any more

    Signed-off-by: Alan Cox <alan@linux.intel.com>
    ---

    drivers/char/moxa.c | 16 ++--------------
    1 files changed, 2 insertions(+), 14 deletions(-)


    diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
    index f9816e6..f8e673a 100644
    --- a/drivers/char/moxa.c
    +++ b/drivers/char/moxa.c
    @@ -34,7 +34,6 @@
    #include <linux/tty.h>
    #include <linux/tty_flip.h>
    #include <linux/major.h>
    -#include <linux/smp_lock.h>
    #include <linux/string.h>
    #include <linux/fcntl.h>
    #include <linux/ptrace.h>
    @@ -202,7 +201,6 @@ static int moxa_tiocmset(struct tty_struct *tty, struct file *file,
    unsigned int set, unsigned int clear);
    static void moxa_poll(unsigned long);
    static void moxa_set_tty_param(struct tty_struct *, struct ktermios *);
    -static void moxa_setup_empty_event(struct tty_struct *);
    static void moxa_shutdown(struct tty_port *);
    static int moxa_carrier_raised(struct tty_port *);
    static void moxa_dtr_rts(struct tty_port *, int);
    @@ -1251,17 +1249,13 @@ static int moxa_chars_in_buffer(struct tty_struct *tty)
    struct moxa_port *ch = tty->driver_data;
    int chars;

    - lock_kernel();
    chars = MoxaPortTxQueue(ch);
    - if (chars) {
    + if (chars)
    /*
    * Make it possible to wakeup anything waiting for output
    * in tty_ioctl.c, etc.
    */
    - if (!test_bit(EMPTYWAIT, &ch->statusflags))
    - moxa_setup_empty_event(tty);
    - }
    - unlock_kernel();
    + set_bit(EMPTYWAIT, &ch->statusflags);
    return chars;
    }

    @@ -1503,12 +1497,6 @@ static void moxa_set_tty_param(struct tty_struct *tty, struct ktermios *old_term
    tty_encode_baud_rate(tty, baud, baud);
    }

    -static void moxa_setup_empty_event(struct tty_struct *tty)
    -{
    - struct moxa_port *ch = tty->driver_data;
    - set_bit(EMPTYWAIT, &ch->statusflags);
    -}
    -
    /*****************************************************************************
    * Driver level functions: *
    *****************************************************************************/


    \
     
     \ /
      Last update: 2009-11-18 15:55    [W:0.020 / U:23.528 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site