From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
To: hch@lst.de, linux-kernel@vger.kernel.org,
Marek Szyprowski <m.szyprowski@samsung.com>,
Robin Murphy <robin.murphy@arm.com>
Cc: linux-rpi-kernel@lists.infradead.org, jeremy.linton@arm.com,
Nicolas Saenz Julienne <nsaenzjulienne@suse.de>,
iommu@lists.linux-foundation.org
Subject: [PATCH v2 2/4] dma-pool: Get rid of dma_in_atomic_pool()
Date: Tue, 14 Jul 2020 14:39:26 +0200 [thread overview]
Message-ID: <20200714123928.8581-3-nsaenzjulienne@suse.de> (raw)
In-Reply-To: <20200714123928.8581-1-nsaenzjulienne@suse.de>
The function is only used once and can be simplified to a one-liner.
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
---
kernel/dma/pool.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/kernel/dma/pool.c b/kernel/dma/pool.c
index 39ca26fa41b5..318035e093fb 100644
--- 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;
--
2.27.0
next prev parent reply other threads:[~2020-07-14 12:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-14 12:39 [PATCH v2 0/4] dma-pool: Fix atomic pool selection Nicolas Saenz Julienne
2020-07-14 12:39 ` [PATCH v2 1/4] dma-direct: Provide function to check physical memory area validity Nicolas Saenz Julienne
2020-07-14 12:39 ` Nicolas Saenz Julienne [this message]
2020-07-14 12:39 ` [PATCH v2 3/4] dma-pool: Introduce dma_guess_pool() Nicolas Saenz Julienne
2020-07-14 12:39 ` [PATCH v2 4/4] dma-pool: Make sure atomic pool suits device Nicolas Saenz Julienne
2020-07-15 7:12 ` [PATCH v2 0/4] dma-pool: Fix atomic pool selection Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200714123928.8581-3-nsaenzjulienne@suse.de \
--to=nsaenzjulienne@suse.de \
--cc=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
--cc=jeremy.linton@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=m.szyprowski@samsung.com \
--cc=robin.murphy@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).