redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

USB: a bit more coding style cleanup

Browse source 
I was sitting in a train threatened to be blocked by ice. I took this
as a hint to do some more boring work for the common good. Here's
a bit more for coding style.

Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Oliver Neukum 2007-01-25 11:17:41 +01:00 committed by Greg Kroah-Hartman
parent 9251644ab3
commit 1a68f71d4f
2 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
drivers/usb/core/buffer.c
View file

@ -49,9 +49,9 @@ static const size_t pool_max [HCD_BUFFER_POOLS] = {
* *
* Call hcd_buffer_destroy() to clean up after using those pools. * Call hcd_buffer_destroy() to clean up after using those pools.
*/ */
int hcd_buffer_create (struct usb_hcd *hcd) int hcd_buffer_create(struct usb_hcd *hcd)
{ {
char name [16]; char name[16];
int i, size; int i, size;
if (!hcd->self.controller->dma_mask) if (!hcd->self.controller->dma_mask)
@ -60,11 +60,11 @@ int hcd_buffer_create (struct usb_hcd *hcd)
for (i = 0; i < HCD_BUFFER_POOLS; i++) { for (i = 0; i < HCD_BUFFER_POOLS; i++) {
if (!(size = pool_max [i])) if (!(size = pool_max [i]))
continue; continue;
snprintf (name, sizeof name, "buffer-%d", size); snprintf(name, sizeof name, "buffer-%d", size);
hcd->pool [i] = dma_pool_create (name, hcd->self.controller, hcd->pool[i] = dma_pool_create(name, hcd->self.controller,
size, size, 0); size, size, 0);
if (!hcd->pool [i]) { if (!hcd->pool [i]) {
hcd_buffer_destroy (hcd); hcd_buffer_destroy(hcd);
return -ENOMEM; return -ENOMEM;
} }
} }
@ -79,14 +79,14 @@ int hcd_buffer_create (struct usb_hcd *hcd)
* *
* This frees the buffer pools created by hcd_buffer_create(). * This frees the buffer pools created by hcd_buffer_create().
*/ */
void hcd_buffer_destroy (struct usb_hcd *hcd) void hcd_buffer_destroy(struct usb_hcd *hcd)
{ {
int i; int i;
for (i = 0; i < HCD_BUFFER_POOLS; i++) { for (i = 0; i < HCD_BUFFER_POOLS; i++) {
struct dma_pool *pool = hcd->pool [i]; struct dma_pool *pool = hcd->pool[i];
if (pool) { if (pool) {
dma_pool_destroy (pool); dma_pool_destroy(pool);
hcd->pool[i] = NULL; hcd->pool[i] = NULL;
} }
} }
@ -97,8 +97,8 @@ void hcd_buffer_destroy (struct usb_hcd *hcd)
* better sharing and to leverage mm/slab.c intelligence. * better sharing and to leverage mm/slab.c intelligence.
*/ */
void *hcd_buffer_alloc ( void *hcd_buffer_alloc(
struct usb_bus *bus, struct usb_bus *bus,
size_t size, size_t size,
gfp_t mem_flags, gfp_t mem_flags,
dma_addr_t *dma dma_addr_t *dma
@ -110,18 +110,18 @@ void *hcd_buffer_alloc (
/* some USB hosts just use PIO */ /* some USB hosts just use PIO */
if (!bus->controller->dma_mask) { if (!bus->controller->dma_mask) {
*dma = ~(dma_addr_t) 0; *dma = ~(dma_addr_t) 0;
return kmalloc (size, mem_flags); return kmalloc(size, mem_flags);
} }
for (i = 0; i < HCD_BUFFER_POOLS; i++) { for (i = 0; i < HCD_BUFFER_POOLS; i++) {
if (size <= pool_max [i]) if (size <= pool_max [i])
return dma_pool_alloc (hcd->pool [i], mem_flags, dma); return dma_pool_alloc(hcd->pool [i], mem_flags, dma);
} }
return dma_alloc_coherent (hcd->self.controller, size, dma, 0); return dma_alloc_coherent(hcd->self.controller, size, dma, 0);
} }
void hcd_buffer_free ( void hcd_buffer_free(
struct usb_bus *bus, struct usb_bus *bus,
size_t size, size_t size,
void *addr, void *addr,
dma_addr_t dma dma_addr_t dma
@ -134,15 +134,15 @@ void hcd_buffer_free (
return; return;
if (!bus->controller->dma_mask) { if (!bus->controller->dma_mask) {
kfree (addr); kfree(addr);
return; return;
} }
for (i = 0; i < HCD_BUFFER_POOLS; i++) { for (i = 0; i < HCD_BUFFER_POOLS; i++) {
if (size <= pool_max [i]) { if (size <= pool_max [i]) {
dma_pool_free (hcd->pool [i], addr, dma); dma_pool_free(hcd->pool [i], addr, dma);
return; return;
} }
} }
dma_free_coherent (hcd->self.controller, size, addr, dma); dma_free_coherent(hcd->self.controller, size, addr, dma);
} }

14
drivers/usb/core/devices.c
View file

@ -164,10 +164,10 @@ static const char *class_decode(const int class)
for (ix = 0; clas_info[ix].class != -1; ix++) for (ix = 0; clas_info[ix].class != -1; ix++)
if (clas_info[ix].class == class) if (clas_info[ix].class == class)
break; break;
return (clas_info[ix].class_name); return clas_info[ix].class_name;
} }
static char *usb_dump_endpoint_descriptor ( static char *usb_dump_endpoint_descriptor(
int speed, int speed,
char *start, char *start,
char *end, char *end,
@ -212,9 +212,9 @@ static char *usb_dump_endpoint_descriptor (
break; break;
case USB_ENDPOINT_XFER_INT: case USB_ENDPOINT_XFER_INT:
type = "Int."; type = "Int.";
if (speed == USB_SPEED_HIGH) { if (speed == USB_SPEED_HIGH)
interval = 1 << (desc->bInterval - 1); interval = 1 << (desc->bInterval - 1);
} else else
interval = desc->bInterval; interval = desc->bInterval;
break; break;
default: /* "can't happen" */ default: /* "can't happen" */
@ -347,7 +347,7 @@ static char *usb_dump_device_descriptor(char *start, char *end, const struct usb
if (start > end) if (start > end)
return start; return start;
start += sprintf (start, format_device1, start += sprintf(start, format_device1,
bcdUSB >> 8, bcdUSB & 0xff, bcdUSB >> 8, bcdUSB & 0xff,
desc->bDeviceClass, desc->bDeviceClass,
class_decode (desc->bDeviceClass), class_decode (desc->bDeviceClass),
@ -367,7 +367,7 @@ static char *usb_dump_device_descriptor(char *start, char *end, const struct usb
/* /*
* Dump the different strings that this device holds. * Dump the different strings that this device holds.
*/ */
static char *usb_dump_device_strings (char *start, char *end, struct usb_device *dev) static char *usb_dump_device_strings(char *start, char *end, struct usb_device *dev)
{ {
if (start > end) if (start > end)
return start; return start;
@ -399,7 +399,7 @@ static char *usb_dump_desc(char *start, char *end, struct usb_device *dev)
if (start > end) if (start > end)
return start; return start;
start = usb_dump_device_strings (start, end, dev); start = usb_dump_device_strings(start, end, dev);
for (i = 0; i < dev->descriptor.bNumConfigurations; i++) { for (i = 0; i < dev->descriptor.bNumConfigurations; i++) {
if (start > end) if (start > end)