From: hch@lst.de (Christoph Hellwig)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/4] arm-nommu: don't define arch_teardown_dma_ops
Date: Mon, 27 Aug 2018 10:47:08 +0200 [thread overview]
Message-ID: <20180827084711.23407-2-hch@lst.de> (raw)
In-Reply-To: <20180827084711.23407-1-hch@lst.de>
We can just use the default implementation.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/arm/include/asm/dma-mapping.h | 2 ++
arch/arm/mm/dma-mapping-nommu.c | 4 ----
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
index 8436f6ade57d..965b7c846ecb 100644
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
@@ -100,8 +100,10 @@ static inline unsigned long dma_max_pfn(struct device *dev)
extern void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
const struct iommu_ops *iommu, bool coherent);
+#ifdef CONFIG_MMU
#define arch_teardown_dma_ops arch_teardown_dma_ops
extern void arch_teardown_dma_ops(struct device *dev);
+#endif
/* do not use this function in a driver */
static inline bool is_device_dma_coherent(struct device *dev)
diff --git a/arch/arm/mm/dma-mapping-nommu.c b/arch/arm/mm/dma-mapping-nommu.c
index f448a0663b10..aa7aba302e76 100644
--- a/arch/arm/mm/dma-mapping-nommu.c
+++ b/arch/arm/mm/dma-mapping-nommu.c
@@ -237,7 +237,3 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
set_dma_ops(dev, dma_ops);
}
-
-void arch_teardown_dma_ops(struct device *dev)
-{
-}
--
2.18.0
next prev parent reply other threads:[~2018-08-27 8:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-27 8:47 cleanup ->dma_configure calling conventions Christoph Hellwig
2018-08-27 8:47 ` Christoph Hellwig [this message]
2018-09-06 12:11 ` [PATCH 1/4] arm-nommu: don't define arch_teardown_dma_ops Robin Murphy
2018-09-11 10:23 ` Vladimir Murzin
2018-08-27 8:47 ` [PATCH 2/4] dma-mapping: remove dma_configure Christoph Hellwig
2018-09-06 12:14 ` Robin Murphy
2018-08-27 8:47 ` [PATCH 3/4] dma-mapping: remove dma_deconfigure Christoph Hellwig
2018-09-06 12:19 ` Robin Murphy
2018-08-27 8:47 ` [PATCH 4/4] dma-mapping: clear dev->dma_ops in arch_teardown_dma_ops Christoph Hellwig
2018-09-06 12:20 ` Robin Murphy
2018-09-22 15:01 ` Guenter Roeck
2018-09-25 5:32 ` Michael Ellerman
2018-09-25 20:16 ` Christoph Hellwig
2018-09-26 4:20 ` Michael Ellerman
2018-09-26 10:45 ` Robin Murphy
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=20180827084711.23407-2-hch@lst.de \
--to=hch@lst.de \
--cc=linux-arm-kernel@lists.infradead.org \
/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).