lkml.org 
[lkml]   [2013]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/1] drivers: usb: core: devio.c: Coding style fixes
    Date
    Whitespace fixes, including:

    - Whitespace after if-keyword
    - Spaces to Tabs

    Other coding style fixes:

    - Added braces for if-else blocks where missing

    Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
    ---
    drivers/usb/core/devio.c | 40 +++++++++++++++++++++-------------------
    1 file changed, 21 insertions(+), 19 deletions(-)

    diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
    index 71dc5d7..5f8a40d 100644
    --- a/drivers/usb/core/devio.c
    +++ b/drivers/usb/core/devio.c
    @@ -1222,7 +1222,7 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
    return -ENOENT;

    u = 0;
    - switch(uurb->type) {
    + switch (uurb->type) {
    case USBDEVFS_URB_TYPE_CONTROL:
    if (!usb_endpoint_xfer_control(&ep->desc))
    return -EINVAL;
    @@ -1636,32 +1636,32 @@ static int proc_reapurbnonblock(struct dev_state *ps, void __user *arg)
    static int proc_control_compat(struct dev_state *ps,
    struct usbdevfs_ctrltransfer32 __user *p32)
    {
    - struct usbdevfs_ctrltransfer __user *p;
    - __u32 udata;
    - p = compat_alloc_user_space(sizeof(*p));
    - if (copy_in_user(p, p32, (sizeof(*p32) - sizeof(compat_caddr_t))) ||
    - get_user(udata, &p32->data) ||
    + struct usbdevfs_ctrltransfer __user *p;
    + __u32 udata;
    + p = compat_alloc_user_space(sizeof(*p));
    + if (copy_in_user(p, p32, (sizeof(*p32) - sizeof(compat_caddr_t))) ||
    + get_user(udata, &p32->data) ||
    put_user(compat_ptr(udata), &p->data))
    return -EFAULT;
    - return proc_control(ps, p);
    + return proc_control(ps, p);
    }

    static int proc_bulk_compat(struct dev_state *ps,
    struct usbdevfs_bulktransfer32 __user *p32)
    {
    - struct usbdevfs_bulktransfer __user *p;
    - compat_uint_t n;
    - compat_caddr_t addr;
    + struct usbdevfs_bulktransfer __user *p;
    + compat_uint_t n;
    + compat_caddr_t addr;

    - p = compat_alloc_user_space(sizeof(*p));
    + p = compat_alloc_user_space(sizeof(*p));

    - if (get_user(n, &p32->ep) || put_user(n, &p->ep) ||
    - get_user(n, &p32->len) || put_user(n, &p->len) ||
    - get_user(n, &p32->timeout) || put_user(n, &p->timeout) ||
    - get_user(addr, &p32->data) || put_user(compat_ptr(addr), &p->data))
    - return -EFAULT;
    + if (get_user(n, &p32->ep) || put_user(n, &p->ep) ||
    + get_user(n, &p32->len) || put_user(n, &p->len) ||
    + get_user(n, &p32->timeout) || put_user(n, &p->timeout) ||
    + get_user(addr, &p32->data) || put_user(compat_ptr(addr), &p->data))
    + return -EFAULT;

    - return proc_bulk(ps, p);
    + return proc_bulk(ps, p);
    }
    static int proc_disconnectsignal_compat(struct dev_state *ps, void __user *arg)
    {
    @@ -1838,10 +1838,12 @@ static int proc_ioctl(struct dev_state *ps, struct usbdevfs_ioctl *ctl)
    return -ENODEV;
    }

    - if (ps->dev->state != USB_STATE_CONFIGURED)
    + if (ps->dev->state != USB_STATE_CONFIGURED) {
    retval = -EHOSTUNREACH;
    - else if (!(intf = usb_ifnum_to_if(ps->dev, ctl->ifno)))
    + }
    + else if (!(intf = usb_ifnum_to_if(ps->dev, ctl->ifno))) {
    retval = -EINVAL;
    + }
    else switch (ctl->ioctl_code) {

    /* disconnect kernel driver from interface */
    --
    1.8.4


    \
     
     \ /
      Last update: 2013-10-12 13:21    [W:3.679 / U:0.436 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site