lkml.org 
[lkml]   [2010]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] USB: ftdi_sio: Remove BKL
    Date
    Seems to me that BKL don't protect nothing here anymore. So I would want suggest to remove it.

    Signed-off-by: Alessio Igor Bogani <abogani@texware.it>
    Cc: Greg Kroah-Hartman <gregkh@suse.de>
    Cc: Johan Hovold <jhovold@gmail.com>
    Cc: Alan Cox <alan@linux.intel.com>
    Cc: Daniel Mack <daniel@caiaq.de>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    ---
    drivers/usb/serial/ftdi_sio.c | 7 -------
    1 files changed, 0 insertions(+), 7 deletions(-)

    diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
    index 216f187..592dc5f 100644
    --- a/drivers/usb/serial/ftdi_sio.c
    +++ b/drivers/usb/serial/ftdi_sio.c
    @@ -33,7 +33,6 @@
    #include <linux/errno.h>
    #include <linux/init.h>
    #include <linux/slab.h>
    -#include <linux/smp_lock.h>
    #include <linux/tty.h>
    #include <linux/tty_driver.h>
    #include <linux/tty_flip.h>
    @@ -1210,7 +1209,6 @@ static int set_serial_info(struct tty_struct *tty,
    if (copy_from_user(&new_serial, newinfo, sizeof(new_serial)))
    return -EFAULT;

    - lock_kernel();
    old_priv = *priv;

    /* Do error checking and permission checking */
    @@ -1218,7 +1216,6 @@ static int set_serial_info(struct tty_struct *tty,
    if (!capable(CAP_SYS_ADMIN)) {
    if (((new_serial.flags & ~ASYNC_USR_MASK) !=
    (priv->flags & ~ASYNC_USR_MASK))) {
    - unlock_kernel();
    return -EPERM;
    }
    priv->flags = ((priv->flags & ~ASYNC_USR_MASK) |
    @@ -1229,7 +1226,6 @@ static int set_serial_info(struct tty_struct *tty,

    if ((new_serial.baud_base != priv->baud_base) &&
    (new_serial.baud_base < 9600)) {
    - unlock_kernel();
    return -EINVAL;
    }

    @@ -1259,11 +1255,8 @@ check_and_exit:
    (priv->flags & ASYNC_SPD_MASK)) ||
    (((priv->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST) &&
    (old_priv.custom_divisor != priv->custom_divisor))) {
    - unlock_kernel();
    change_speed(tty, port);
    }
    - else
    - unlock_kernel();
    return 0;

    } /* set_serial_info */
    --
    1.6.3.3


    \
     
     \ /
      Last update: 2010-02-02 15:03    [W:0.020 / U:13.792 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site