Skip to content

Commit

Permalink
USB: usbtmc: indent & braces disagree, something else is desired
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Ilpo Järvinen authored and Greg Kroah-Hartman committed Jan 7, 2009
1 parent b404299 commit 857cc4d
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions drivers/usb/class/usbtmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -482,7 +483,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;
Expand Down Expand Up @@ -526,11 +526,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,
Expand Down

0 comments on commit 857cc4d

Please sign in to comment.