lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: Core: Fix minor coding style issues

Browse Source 
Fixing all coding style issues in buffer.c

Signed-off-by: Tobias Ollmann <tobias.ollmann@gmx.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Tobias Ollmann
2010-12-25 11:17:01 +01:00
committed by Greg Kroah-Hartman
parent 60678b60d7
commit 0828376dea
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/usb/core/buffer.c
View File

@@ -10,7 +10,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <asm/io.h> #include <linux/io.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/dmapool.h> #include <linux/dmapool.h>
#include <linux/usb.h> #include <linux/usb.h>
@@ -22,7 +22,7 @@
*/ */
/* FIXME tune these based on pool statistics ... */ /* FIXME tune these based on pool statistics ... */
static const size_t pool_max [HCD_BUFFER_POOLS] = { static const size_t pool_max[HCD_BUFFER_POOLS] = {
/* platforms without dma-friendly caches might need to /* platforms without dma-friendly caches might need to
* prevent cacheline sharing... * prevent cacheline sharing...
*/ */
@@ -51,7 +51,7 @@ static const size_t pool_max [HCD_BUFFER_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 &&
!(hcd->driver->flags & HCD_LOCAL_MEM)) !(hcd->driver->flags & HCD_LOCAL_MEM))
@@ -64,7 +64,7 @@ int hcd_buffer_create(struct usb_hcd *hcd)
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;
} }
@@ -99,14 +99,14 @@ void hcd_buffer_destroy(struct usb_hcd *hcd)
*/ */
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
) )
{ {
struct usb_hcd *hcd = bus_to_hcd(bus); struct usb_hcd *hcd = bus_to_hcd(bus);
int i; int i;
/* some USB hosts just use PIO */ /* some USB hosts just use PIO */
if (!bus->controller->dma_mask && if (!bus->controller->dma_mask &&
@@ -116,21 +116,21 @@ void *hcd_buffer_alloc(
} }
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, mem_flags); return dma_alloc_coherent(hcd->self.controller, size, dma, mem_flags);
} }
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
) )
{ {
struct usb_hcd *hcd = bus_to_hcd(bus); struct usb_hcd *hcd = bus_to_hcd(bus);
int i; int i;
if (!addr) if (!addr)
return; return;
@@ -142,8 +142,8 @@ void hcd_buffer_free(
} }
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;
} }
} }