Skip to content

Commit 23e469b

Browse files
Nicolas Saenz JulienneChristoph Hellwig
authored andcommitted
dma-pool: get rid of dma_in_atomic_pool()
The function is only used once and can be simplified to a one-liner. Signed-off-by: Nicolas Saenz Julienne <[email protected]> Signed-off-by: Christoph Hellwig <[email protected]>
1 parent 567f6a6 commit 23e469b

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

kernel/dma/pool.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -217,15 +217,6 @@ static inline struct gen_pool *dev_to_pool(struct device *dev)
217217
return atomic_pool_kernel;
218218
}
219219

220-
static bool dma_in_atomic_pool(struct device *dev, void *start, size_t size)
221-
{
222-
struct gen_pool *pool = dev_to_pool(dev);
223-
224-
if (unlikely(!pool))
225-
return false;
226-
return gen_pool_has_addr(pool, (unsigned long)start, size);
227-
}
228-
229220
void *dma_alloc_from_pool(struct device *dev, size_t size,
230221
struct page **ret_page, gfp_t flags)
231222
{
@@ -260,7 +251,7 @@ bool dma_free_from_pool(struct device *dev, void *start, size_t size)
260251
{
261252
struct gen_pool *pool = dev_to_pool(dev);
262253

263-
if (!dma_in_atomic_pool(dev, start, size))
254+
if (!pool || !gen_pool_has_addr(pool, (unsigned long)start, size))
264255
return false;
265256
gen_pool_free(pool, (unsigned long)start, size);
266257
return true;

0 commit comments

Comments
 (0)