This is a note to let you know that I've just added the patch titled Subject: USB: usbtmc: indent & braces disagree, something else is desired to my gregkh-2.6 tree. Its filename is usb-usbtmc-indent-braces-disagree-something-else-is-desired.patch This tree can be found at http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/ >From ilpo.jarvinen@helsinki.fi Wed Nov 12 11:29:47 2008 From: "Ilpo Järvinen" Date: Thu, 30 Oct 2008 13:56:47 +0200 (EET) Subject: USB: usbtmc: indent & braces disagree, something else is desired To: Greg Kroah-Hartman Cc: LKML Message-ID: 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 Signed-off-by: Greg Kroah-Hartman --- drivers/usb/class/usbtmc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) --- a/drivers/usb/class/usbtmc.c +++ b/drivers/usb/class/usbtmc.c @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -481,7 +482,6 @@ static ssize_t usbtmc_write(struct file 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 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, Patches currently in gregkh-2.6 which might be from ilpo.jarvinen@helsinki.fi are usb/usb-usbtmc-indent-braces-disagree-something-else-is-desired.patch