dma-pool: get rid of dma_in_atomic_pool()

[linux-2.6-microblaze.git] / kernel / dma / pool.c

diff --git a/kernel/dma/pool.c b/kernel/dma/pool.c
index 39ca26f..318035e 100644 (file)
--- a/kernel/dma/pool.c
+++ b/kernel/dma/pool.c
@@ -217,15 +217,6 @@ static inline struct gen_pool *dev_to_pool(struct device *dev)
        return atomic_pool_kernel;
 }
 
-static bool dma_in_atomic_pool(struct device *dev, void *start, size_t size)
-{
-       struct gen_pool *pool = dev_to_pool(dev);
-
-       if (unlikely(!pool))
-               return false;
-       return gen_pool_has_addr(pool, (unsigned long)start, size);
-}
-
 void *dma_alloc_from_pool(struct device *dev, size_t size,
                          struct page **ret_page, gfp_t flags)
 {
@@ -260,7 +251,7 @@ bool dma_free_from_pool(struct device *dev, void *start, size_t size)
 {
        struct gen_pool *pool = dev_to_pool(dev);
 
-       if (!dma_in_atomic_pool(dev, start, size))
+       if (!pool || !gen_pool_has_addr(pool, (unsigned long)start, size))
                return false;
        gen_pool_free(pool, (unsigned long)start, size);
        return true;