Commit 1c16eda0 authored by Russell King's avatar Russell King

[ARM] Update ARM SA1111 pci_pool implementation

2.5.43 removed the mem_flags parameter to pci_pool_create.  The ARM
SA1111 implementation needs to follow for the usbo hci implementation.
parent 31aa6e2b
...@@ -70,7 +70,7 @@ static inline const char *slot_name(const struct pci_pool *pool) ...@@ -70,7 +70,7 @@ static inline const char *slot_name(const struct pci_pool *pool)
* @size: size of the blocks in this pool. * @size: size of the blocks in this pool.
* @align: alignment requirement for blocks; must be a power of two * @align: alignment requirement for blocks; must be a power of two
* @allocation: returned blocks won't cross this boundary (or zero) * @allocation: returned blocks won't cross this boundary (or zero)
* @mem_flags: SLAB_* flags. * Context: !in_interrupt()
* *
* Returns a pci allocation pool with the requested characteristics, or * Returns a pci allocation pool with the requested characteristics, or
* null if one can't be created. Given one of these pools, pci_pool_alloc() * null if one can't be created. Given one of these pools, pci_pool_alloc()
...@@ -86,7 +86,7 @@ static inline const char *slot_name(const struct pci_pool *pool) ...@@ -86,7 +86,7 @@ static inline const char *slot_name(const struct pci_pool *pool)
*/ */
struct pci_pool * struct pci_pool *
pci_pool_create (const char *name, struct pci_dev *pdev, pci_pool_create (const char *name, struct pci_dev *pdev,
size_t size, size_t align, size_t allocation, int mem_flags) size_t size, size_t align, size_t allocation)
{ {
struct pci_pool *retval; struct pci_pool *retval;
...@@ -110,7 +110,7 @@ pci_pool_create (const char *name, struct pci_dev *pdev, ...@@ -110,7 +110,7 @@ pci_pool_create (const char *name, struct pci_dev *pdev,
} else if (allocation < size) } else if (allocation < size)
return 0; return 0;
if (!(retval = kmalloc (sizeof *retval, mem_flags))) if (!(retval = kmalloc (sizeof *retval, SLAB_KERNEL)))
return retval; return retval;
strncpy (retval->name, name, sizeof retval->name); strncpy (retval->name, name, sizeof retval->name);
......
...@@ -61,8 +61,7 @@ create_safe_buffer_pools(void) ...@@ -61,8 +61,7 @@ create_safe_buffer_pools(void)
SA1111_FAKE_PCIDEV, SA1111_FAKE_PCIDEV,
SIZE_SMALL, SIZE_SMALL,
0 /* byte alignment */, 0 /* byte alignment */,
0 /* no page-crossing issues */, 0 /* no page-crossing issues */);
SLAB_KERNEL);
if (0 == small_buffer_pool) { if (0 == small_buffer_pool) {
printk(KERN_ERR printk(KERN_ERR
"sa1111_pcibuf: could not allocate small pci pool\n"); "sa1111_pcibuf: could not allocate small pci pool\n");
...@@ -73,8 +72,7 @@ create_safe_buffer_pools(void) ...@@ -73,8 +72,7 @@ create_safe_buffer_pools(void)
SA1111_FAKE_PCIDEV, SA1111_FAKE_PCIDEV,
SIZE_LARGE, SIZE_LARGE,
0 /* byte alignment */, 0 /* byte alignment */,
0 /* no page-crossing issues */, 0 /* no page-crossing issues */);
SLAB_KERNEL);
if (0 == large_buffer_pool) { if (0 == large_buffer_pool) {
printk(KERN_ERR printk(KERN_ERR
"sa1111_pcibuf: could not allocate large pci pool\n"); "sa1111_pcibuf: could not allocate large pci pool\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment