* [PATCH] usb : gadget : usbstring : fix style problems
@ 2011-11-16 4:43 Tonylijo
2011-11-16 11:09 ` Felipe Balbi
2011-11-16 12:08 ` Sergei Shtylyov
0 siblings, 2 replies; 4+ messages in thread
From: Tonylijo @ 2011-11-16 4:43 UTC (permalink / raw)
To: Felipe Balbi; +Cc: Greg Kroah-Hartman, linux-usb, linux-kernel
Minor fixes for problems found by checkpatch.pl in usbstring.c.
Signed-off-by: Tonylijo Jose <mail@tonylijo.in>
---
diff --git a/drivers/usb/gadget/usbstring.c
b/drivers/usb/gadget/usbstring.c
index 58c4d37..2bdc56a 100644
--- a/drivers/usb/gadget/usbstring.c
+++ b/drivers/usb/gadget/usbstring.c
@@ -32,8 +32,9 @@ static int utf8_to_utf16le(const char *s, __le16 *cp,
unsigned len)
*/
while (len != 0 && (c = (u8) *s++) != 0) {
if (unlikely(c & 0x80)) {
- // 2-byte sequence:
- // 00000yyyyyxxxxxx = 110yyyyy 10xxxxxx
+ /* 2-byte sequence:
+ * 00000yyyyyxxxxxx = 110yyyyy 10xxxxxx
+ */
if ((c & 0xe0) == 0xc0) {
uchar = (c & 0x1f) << 6;
@@ -43,8 +44,9 @@ static int utf8_to_utf16le(const char *s, __le16 *cp,
unsigned len)
c &= 0x3f;
uchar |= c;
- // 3-byte sequence (most CJKV characters):
- // zzzzyyyyyyxxxxxx = 1110zzzz 10yyyyyy 10xxxxxx
+ /* 3-byte sequence (most CJKV characters):
+ * zzzzyyyyyyxxxxxx = 1110zzzz 10yyyyyy 10xxxxxx
+ */
} else if ((c & 0xf0) == 0xe0) {
uchar = (c & 0x0f) << 12;
@@ -64,12 +66,12 @@ static int utf8_to_utf16le(const char *s, __le16
*cp, unsigned len)
if (0xd800 <= uchar && uchar <= 0xdfff)
goto fail;
- // 4-byte sequence (surrogate pairs, currently rare):
- // 11101110wwwwzzzzyy + 110111yyyyxxxxxx
- // = 11110uuu 10uuzzzz 10yyyyyy 10xxxxxx
- // (uuuuu = wwww + 1)
- // FIXME accept the surrogate code points (only)
-
+ /* 4-byte sequence (surrogate pairs, currently rare):
+ * 11101110wwwwzzzzyy + 110111yyyyxxxxxx
+ * = 11110uuu 10uuzzzz 10yyyyyy 10xxxxxx
+ * (uuuuu = wwww + 1)
+ * FIXME accept the surrogate code points (only)
+ */
} else
goto fail;
} else
@@ -85,7 +87,7 @@ fail:
/**
- * usb_gadget_get_string - fill out a string descriptor
+ * usb_gadget_get_string - fill out a string descriptor
* @table: of c strings encoded using UTF-8
* @id: string id, from low byte of wValue in get string descriptor
* @buf: at least 256 bytes
@@ -102,17 +104,17 @@ fail:
* characters (which are also widely used in C strings).
*/
int
-usb_gadget_get_string (struct usb_gadget_strings *table, int id, u8
*buf)
+usb_gadget_get_string(struct usb_gadget_strings *table, int id, u8
*buf)
{
struct usb_string *s;
int len;
/* descriptor 0 has the language id */
if (id == 0) {
- buf [0] = 4;
- buf [1] = USB_DT_STRING;
- buf [2] = (u8) table->language;
- buf [3] = (u8) (table->language >> 8);
+ buf[0] = 4;
+ buf[1] = USB_DT_STRING;
+ buf[2] = (u8) table->language;
+ buf[3] = (u8) (table->language >> 8);
return 4;
}
for (s = table->strings; s && s->s; s++)
@@ -124,13 +126,13 @@ usb_gadget_get_string (struct usb_gadget_strings
*table, int id, u8 *buf)
return -EINVAL;
/* string descriptors have length, tag, then UTF16-LE text */
- len = min ((size_t) 126, strlen (s->s));
- memset (buf + 2, 0, 2 * len); /* zero all the bytes */
+ len = min((size_t) 126, strlen(s->s));
+ memset(buf + 2, 0, 2 * len); /* zero all the bytes */
len = utf8_to_utf16le(s->s, (__le16 *)&buf[2], len);
if (len < 0)
return -EINVAL;
- buf [0] = (len + 1) * 2;
- buf [1] = USB_DT_STRING;
- return buf [0];
+ buf[0] = (len + 1) * 2;
+ buf[1] = USB_DT_STRING;
+ return buf[0];
}
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] usb : gadget : usbstring : fix style problems
2011-11-16 4:43 [PATCH] usb : gadget : usbstring : fix style problems Tonylijo
@ 2011-11-16 11:09 ` Felipe Balbi
2011-11-17 10:45 ` Tonylijo
2011-11-16 12:08 ` Sergei Shtylyov
1 sibling, 1 reply; 4+ messages in thread
From: Felipe Balbi @ 2011-11-16 11:09 UTC (permalink / raw)
To: Tonylijo; +Cc: Felipe Balbi, Greg Kroah-Hartman, linux-usb, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 957 bytes --]
On Wed, Nov 16, 2011 at 10:13:02AM +0530, Tonylijo wrote:
> Minor fixes for problems found by checkpatch.pl in usbstring.c.
list here the return from checkpatch.pl --terse just so we know what
you're fixing.
> Signed-off-by: Tonylijo Jose <mail@tonylijo.in>
> ---
> diff --git a/drivers/usb/gadget/usbstring.c
> b/drivers/usb/gadget/usbstring.c
> index 58c4d37..2bdc56a 100644
> --- a/drivers/usb/gadget/usbstring.c
> +++ b/drivers/usb/gadget/usbstring.c
> @@ -32,8 +32,9 @@ static int utf8_to_utf16le(const char *s, __le16 *cp,
> unsigned len)
> */
> while (len != 0 && (c = (u8) *s++) != 0) {
> if (unlikely(c & 0x80)) {
> - // 2-byte sequence:
> - // 00000yyyyyxxxxxx = 110yyyyy 10xxxxxx
> + /* 2-byte sequence:
> + * 00000yyyyyxxxxxx = 110yyyyy 10xxxxxx
> + */
still wrong. This should've been:
/*
* 2-byte sequence
* 00000yyyyyxxxxxx = 110yyyyy 10xxxxxx
*/
likewise all bellow.
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] usb : gadget : usbstring : fix style problems
2011-11-16 11:09 ` Felipe Balbi
@ 2011-11-17 10:45 ` Tonylijo
0 siblings, 0 replies; 4+ messages in thread
From: Tonylijo @ 2011-11-17 10:45 UTC (permalink / raw)
To: balbi; +Cc: linux-kernel, linux-usb
On Wed, 2011-11-16 at 13:09 +0200, Felipe Balbi wrote:
> On Wed, Nov 16, 2011 at 10:13:02AM +0530, Tonylijo wrote:
> > Minor fixes for problems found by checkpatch.pl in usbstring.c.
>
> list here the return from checkpatch.pl --terse just so we know what
> you're fixing.
>
> > Signed-off-by: Tonylijo Jose <mail@tonylijo.in>
> > ---
> > diff --git a/drivers/usb/gadget/usbstring.c
> > b/drivers/usb/gadget/usbstring.c
> > index 58c4d37..2bdc56a 100644
> > --- a/drivers/usb/gadget/usbstring.c
> > +++ b/drivers/usb/gadget/usbstring.c
> > @@ -32,8 +32,9 @@ static int utf8_to_utf16le(const char *s, __le16 *cp,
> > unsigned len)
> > */
> > while (len != 0 && (c = (u8) *s++) != 0) {
> > if (unlikely(c & 0x80)) {
> > - // 2-byte sequence:
> > - // 00000yyyyyxxxxxx = 110yyyyy 10xxxxxx
> > + /* 2-byte sequence:
> > + * 00000yyyyyxxxxxx = 110yyyyy 10xxxxxx
> > + */
>
> still wrong. This should've been:
>
> /*
> * 2-byte sequence
> * 00000yyyyyxxxxxx = 110yyyyy 10xxxxxx
> */
>
> likewise all bellow.
>
Thanks for your review. I will send the corrected patch soon.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] usb : gadget : usbstring : fix style problems
2011-11-16 4:43 [PATCH] usb : gadget : usbstring : fix style problems Tonylijo
2011-11-16 11:09 ` Felipe Balbi
@ 2011-11-16 12:08 ` Sergei Shtylyov
1 sibling, 0 replies; 4+ messages in thread
From: Sergei Shtylyov @ 2011-11-16 12:08 UTC (permalink / raw)
To: Tonylijo; +Cc: Felipe Balbi, Greg Kroah-Hartman, linux-usb, linux-kernel
Hello.
On 16-11-2011 8:43, Tonylijo wrote:
> Minor fixes for problems found by checkpatch.pl in usbstring.c.
> Signed-off-by: Tonylijo Jose<mail@tonylijo.in>
> ---
> diff --git a/drivers/usb/gadget/usbstring.c
> b/drivers/usb/gadget/usbstring.c
> index 58c4d37..2bdc56a 100644
> --- a/drivers/usb/gadget/usbstring.c
> +++ b/drivers/usb/gadget/usbstring.c
[...]
> @@ -102,17 +104,17 @@ fail:
> * characters (which are also widely used in C strings).
> */
> int
> -usb_gadget_get_string (struct usb_gadget_strings *table, int id, u8
> *buf)
> +usb_gadget_get_string(struct usb_gadget_strings *table, int id, u8
> *buf)
The patch was line-wrapped by your mailer. Seems easy to fix though...
> @@ -124,13 +126,13 @@ usb_gadget_get_string (struct usb_gadget_strings
> *table, int id, u8 *buf)
> return -EINVAL;
>
> /* string descriptors have length, tag, then UTF16-LE text */
> - len = min ((size_t) 126, strlen (s->s));
> - memset (buf + 2, 0, 2 * len); /* zero all the bytes */
> + len = min((size_t) 126, strlen(s->s));
Worth converting to min_t() probably...
WBR, Sergei
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-11-17 11:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-16 4:43 [PATCH] usb : gadget : usbstring : fix style problems Tonylijo
2011-11-16 11:09 ` Felipe Balbi
2011-11-17 10:45 ` Tonylijo
2011-11-16 12:08 ` Sergei Shtylyov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox