diff options
author | Carlos Sánchez Acosta <csanchez@neurowork.net> | 2010-04-14 07:58:53 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-20 16:21:38 -0400 |
commit | 44526f91b887a71ebd5d534903d55dc8752b8cd3 (patch) | |
tree | 94daffed92d82b903f8b345abb0a4234734ec9d5 | |
parent | 4545f7eea31f3f8486b7b925d67abe2e4e47a75a (diff) |
USB: devices: fix Coding Styles
Fixed coding styles in the config usb driver.
Signed-off-by: Carlos Sánchez Acosta <csanchez@neurowork.net>
Signed-off-by: Alejandro Sánchez Acosta <asanchez@neurowork.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/usb/core/devices.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c index 75077215a8b8..3449742c00e1 100644 --- a/drivers/usb/core/devices.c +++ b/drivers/usb/core/devices.c | |||
@@ -1,7 +1,8 @@ | |||
1 | /* | 1 | /* |
2 | * devices.c | 2 | * devices.c |
3 | * (C) Copyright 1999 Randy Dunlap. | 3 | * (C) Copyright 1999 Randy Dunlap. |
4 | * (C) Copyright 1999,2000 Thomas Sailer <sailer@ife.ee.ethz.ch>. (proc file per device) | 4 | * (C) Copyright 1999,2000 Thomas Sailer <sailer@ife.ee.ethz.ch>. |
5 | * (proc file per device) | ||
5 | * (C) Copyright 1999 Deti Fliegl (new USB architecture) | 6 | * (C) Copyright 1999 Deti Fliegl (new USB architecture) |
6 | * | 7 | * |
7 | * This program is free software; you can redistribute it and/or modify | 8 | * This program is free software; you can redistribute it and/or modify |
@@ -57,7 +58,7 @@ | |||
57 | #include <linux/usbdevice_fs.h> | 58 | #include <linux/usbdevice_fs.h> |
58 | #include <linux/usb/hcd.h> | 59 | #include <linux/usb/hcd.h> |
59 | #include <linux/mutex.h> | 60 | #include <linux/mutex.h> |
60 | #include <asm/uaccess.h> | 61 | #include <linux/uaccess.h> |
61 | 62 | ||
62 | #include "usb.h" | 63 | #include "usb.h" |
63 | 64 | ||
@@ -138,8 +139,8 @@ struct class_info { | |||
138 | char *class_name; | 139 | char *class_name; |
139 | }; | 140 | }; |
140 | 141 | ||
141 | static const struct class_info clas_info[] = | 142 | static const struct class_info clas_info[] = { |
142 | { /* max. 5 chars. per name string */ | 143 | /* max. 5 chars. per name string */ |
143 | {USB_CLASS_PER_INTERFACE, ">ifc"}, | 144 | {USB_CLASS_PER_INTERFACE, ">ifc"}, |
144 | {USB_CLASS_AUDIO, "audio"}, | 145 | {USB_CLASS_AUDIO, "audio"}, |
145 | {USB_CLASS_COMM, "comm."}, | 146 | {USB_CLASS_COMM, "comm."}, |
@@ -191,8 +192,10 @@ static char *usb_dump_endpoint_descriptor(int speed, char *start, char *end, | |||
191 | 192 | ||
192 | if (speed == USB_SPEED_HIGH) { | 193 | if (speed == USB_SPEED_HIGH) { |
193 | switch (le16_to_cpu(desc->wMaxPacketSize) & (0x03 << 11)) { | 194 | switch (le16_to_cpu(desc->wMaxPacketSize) & (0x03 << 11)) { |
194 | case 1 << 11: bandwidth = 2; break; | 195 | case 1 << 11: |
195 | case 2 << 11: bandwidth = 3; break; | 196 | bandwidth = 2; break; |
197 | case 2 << 11: | ||
198 | bandwidth = 3; break; | ||
196 | } | 199 | } |
197 | } | 200 | } |
198 | 201 | ||
@@ -200,7 +203,7 @@ static char *usb_dump_endpoint_descriptor(int speed, char *start, char *end, | |||
200 | switch (usb_endpoint_type(desc)) { | 203 | switch (usb_endpoint_type(desc)) { |
201 | case USB_ENDPOINT_XFER_CONTROL: | 204 | case USB_ENDPOINT_XFER_CONTROL: |
202 | type = "Ctrl"; | 205 | type = "Ctrl"; |
203 | if (speed == USB_SPEED_HIGH) /* uframes per NAK */ | 206 | if (speed == USB_SPEED_HIGH) /* uframes per NAK */ |
204 | interval = desc->bInterval; | 207 | interval = desc->bInterval; |
205 | else | 208 | else |
206 | interval = 0; | 209 | interval = 0; |