|
@@ -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);
|
|
|
|
- hcd->pool [i] = dma_pool_create (name, hcd->self.controller,
|
|
|
|
|
|
+ snprintf(name, sizeof name, "buffer-%d", size);
|
|
|
|
+ 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 (
|
|
|
|
- struct usb_bus *bus,
|
|
|
|
|
|
+void *hcd_buffer_alloc(
|
|
|
|
+ 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 (
|
|
|
|
- struct usb_bus *bus,
|
|
|
|
|
|
+void hcd_buffer_free(
|
|
|
|
+ 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);
|
|
}
|
|
}
|