From: Christoph Hellwig <hch@lst.de>
To: Jonas Bonn <jonas@southpole.se>,
Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>,
Stafford Horne <shorne@gmail.com>
Cc: openrisc@lists.librecores.org, iommu@lists.linux-foundation.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/4] openrisc: remove the no-op unmap_page and unmap_sg DMA operations
Date: Thu, 19 Jul 2018 06:02:30 -0700 [thread overview]
Message-ID: <20180719130232.1819-3-hch@lst.de> (raw)
In-Reply-To: <20180719130232.1819-1-hch@lst.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/openrisc/kernel/dma.c | 23 -----------------------
1 file changed, 23 deletions(-)
diff --git a/arch/openrisc/kernel/dma.c b/arch/openrisc/kernel/dma.c
index 47601274abf7..7cadff93d179 100644
--- a/arch/openrisc/kernel/dma.c
+++ b/arch/openrisc/kernel/dma.c
@@ -171,14 +171,6 @@ or1k_map_page(struct device *dev, struct page *page,
return addr;
}
-static void
-or1k_unmap_page(struct device *dev, dma_addr_t dma_handle,
- size_t size, enum dma_data_direction dir,
- unsigned long attrs)
-{
- /* Nothing special to do here... */
-}
-
static int
or1k_map_sg(struct device *dev, struct scatterlist *sg,
int nents, enum dma_data_direction dir,
@@ -195,19 +187,6 @@ or1k_map_sg(struct device *dev, struct scatterlist *sg,
return nents;
}
-static void
-or1k_unmap_sg(struct device *dev, struct scatterlist *sg,
- int nents, enum dma_data_direction dir,
- unsigned long attrs)
-{
- struct scatterlist *s;
- int i;
-
- for_each_sg(sg, s, nents, i) {
- or1k_unmap_page(dev, sg_dma_address(s), sg_dma_len(s), dir, 0);
- }
-}
-
static void
or1k_sync_single_for_device(struct device *dev,
dma_addr_t dma_handle, size_t size,
@@ -226,9 +205,7 @@ const struct dma_map_ops or1k_dma_map_ops = {
.alloc = or1k_dma_alloc,
.free = or1k_dma_free,
.map_page = or1k_map_page,
- .unmap_page = or1k_unmap_page,
.map_sg = or1k_map_sg,
- .unmap_sg = or1k_unmap_sg,
.sync_single_for_device = or1k_sync_single_for_device,
};
EXPORT_SYMBOL(or1k_dma_map_ops);
--
2.18.0
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de>
To: openrisc@lists.librecores.org
Subject: [OpenRISC] [PATCH 2/4] openrisc: remove the no-op unmap_page and unmap_sg DMA operations
Date: Thu, 19 Jul 2018 06:02:30 -0700 [thread overview]
Message-ID: <20180719130232.1819-3-hch@lst.de> (raw)
In-Reply-To: <20180719130232.1819-1-hch@lst.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/openrisc/kernel/dma.c | 23 -----------------------
1 file changed, 23 deletions(-)
diff --git a/arch/openrisc/kernel/dma.c b/arch/openrisc/kernel/dma.c
index 47601274abf7..7cadff93d179 100644
--- a/arch/openrisc/kernel/dma.c
+++ b/arch/openrisc/kernel/dma.c
@@ -171,14 +171,6 @@ or1k_map_page(struct device *dev, struct page *page,
return addr;
}
-static void
-or1k_unmap_page(struct device *dev, dma_addr_t dma_handle,
- size_t size, enum dma_data_direction dir,
- unsigned long attrs)
-{
- /* Nothing special to do here... */
-}
-
static int
or1k_map_sg(struct device *dev, struct scatterlist *sg,
int nents, enum dma_data_direction dir,
@@ -195,19 +187,6 @@ or1k_map_sg(struct device *dev, struct scatterlist *sg,
return nents;
}
-static void
-or1k_unmap_sg(struct device *dev, struct scatterlist *sg,
- int nents, enum dma_data_direction dir,
- unsigned long attrs)
-{
- struct scatterlist *s;
- int i;
-
- for_each_sg(sg, s, nents, i) {
- or1k_unmap_page(dev, sg_dma_address(s), sg_dma_len(s), dir, 0);
- }
-}
-
static void
or1k_sync_single_for_device(struct device *dev,
dma_addr_t dma_handle, size_t size,
@@ -226,9 +205,7 @@ const struct dma_map_ops or1k_dma_map_ops = {
.alloc = or1k_dma_alloc,
.free = or1k_dma_free,
.map_page = or1k_map_page,
- .unmap_page = or1k_unmap_page,
.map_sg = or1k_map_sg,
- .unmap_sg = or1k_unmap_sg,
.sync_single_for_device = or1k_sync_single_for_device,
};
EXPORT_SYMBOL(or1k_dma_map_ops);
--
2.18.0
next prev parent reply other threads:[~2018-07-19 13:02 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-19 13:02 use the generic dma-noncoherent code for openrisc Christoph Hellwig
2018-07-19 13:02 ` [OpenRISC] " Christoph Hellwig
2018-07-19 13:02 ` [PATCH 1/4] openrisc: remove the sync_single_for_cpu DMA operation Christoph Hellwig
2018-07-19 13:02 ` [OpenRISC] " Christoph Hellwig
2018-07-19 13:02 ` Christoph Hellwig [this message]
2018-07-19 13:02 ` [OpenRISC] [PATCH 2/4] openrisc: remove the no-op unmap_page and unmap_sg DMA operations Christoph Hellwig
2018-07-19 13:02 ` [PATCH 3/4] openrisc: fix cache maintainance the the sync_single_for_device DMA operation Christoph Hellwig
2018-07-19 13:02 ` [OpenRISC] " Christoph Hellwig
2018-07-19 13:02 ` [PATCH 4/4] openrisc: use generic dma_noncoherent_ops Christoph Hellwig
2018-07-19 13:02 ` [OpenRISC] " Christoph Hellwig
2018-07-21 5:31 ` use the generic dma-noncoherent code for openrisc Stafford Horne
2018-07-21 5:31 ` [OpenRISC] " Stafford Horne
[not found] ` <20180721053142.GC9742-Uk7Bhu+bUQgm0WYXfsLZQReHL2rgt/dS@public.gmane.org>
2018-07-21 12:37 ` Christoph Hellwig
2018-07-21 12:37 ` Christoph Hellwig
2018-07-21 12:37 ` [OpenRISC] " 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=20180719130232.1819-3-hch@lst.de \
--to=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
--cc=jonas@southpole.se \
--cc=linux-kernel@vger.kernel.org \
--cc=openrisc@lists.librecores.org \
--cc=shorne@gmail.com \
--cc=stefan.kristiansson@saunalahti.fi \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.