lkml.org 
[lkml]   [2010]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/6] usb/gadget: Do not take BKL for gadget->ops->ioctl
    Date
    There is no gadget driver in the tree that
    actually implements the ioctl operation, so
    obviously it is not necessary to hold the
    BKL around the call.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    ---
    drivers/usb/gadget/f_fs.c | 2 --
    drivers/usb/gadget/inode.c | 6 ++----
    2 files changed, 2 insertions(+), 6 deletions(-)

    diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
    index d69eccf..715da23 100644
    --- a/drivers/usb/gadget/f_fs.c
    +++ b/drivers/usb/gadget/f_fs.c
    @@ -714,9 +714,7 @@ static long ffs_ep0_ioctl(struct file *file, unsigned code, unsigned long value)
    struct ffs_function *func = ffs->func;
    ret = func ? ffs_func_revmap_intf(func, value) : -ENODEV;
    } else if (gadget->ops->ioctl) {
    - lock_kernel();
    ret = gadget->ops->ioctl(gadget, code, value);
    - unlock_kernel();
    } else {
    ret = -ENOTTY;
    }
    diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
    index de8a838..5308392 100644
    --- a/drivers/usb/gadget/inode.c
    +++ b/drivers/usb/gadget/inode.c
    @@ -1299,11 +1299,9 @@ static long dev_ioctl (struct file *fd, unsigned code, unsigned long value)
    struct usb_gadget *gadget = dev->gadget;
    long ret = -ENOTTY;

    - if (gadget->ops->ioctl) {
    - lock_kernel();
    + if (gadget->ops->ioctl)
    ret = gadget->ops->ioctl (gadget, code, value);
    - unlock_kernel();
    - }
    +
    return ret;
    }

    --
    1.7.0.4


    \
     
     \ /
      Last update: 2010-06-01 23:09    [W:0.023 / U:92.140 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site