lkml.org 
[lkml]   [2008]   [Oct]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 06/10] usbtmc: indent & braces disagree, something else is desired

    It seems that there's rather involved way to say something
    which is commonly written in a plain simple form.

    Some type changes would probably be necessary to get gcc
    to do bitops instead of divide but it's no worse after my
    change than before I think.

    Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
    ---
    drivers/usb/class/usbtmc.c | 9 +++------
    1 files changed, 3 insertions(+), 6 deletions(-)

    diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
    index 543811f..711a9fa 100644
    --- a/drivers/usb/class/usbtmc.c
    +++ b/drivers/usb/class/usbtmc.c
    @@ -21,6 +21,7 @@

    #include <linux/init.h>
    #include <linux/module.h>
    +#include <linux/kernel.h>
    #include <linux/fs.h>
    #include <linux/uaccess.h>
    #include <linux/kref.h>
    @@ -481,7 +482,6 @@ static ssize_t usbtmc_write(struct file *filp, const char __user *buf,
    int retval;
    int actual;
    unsigned long int n_bytes;
    - int n;
    int remaining;
    int done;
    int this_part;
    @@ -525,11 +525,8 @@ static ssize_t usbtmc_write(struct file *filp, const char __user *buf,
    goto exit;
    }

    - n_bytes = 12 + this_part;
    - if (this_part % 4)
    - n_bytes += 4 - this_part % 4;
    - for (n = 12 + this_part; n < n_bytes; n++)
    - buffer[n] = 0;
    + n_bytes = roundup(12 + this_part, 4);
    + memset(buffer + 12 + this_part, 0, n_bytes - (12 + this_part));

    retval = usb_bulk_msg(data->usb_dev,
    usb_sndbulkpipe(data->usb_dev,
    --
    1.5.2.2
    \
     
     \ /
      Last update: 2008-10-30 13:01    [W:0.020 / U:62.288 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site