From: Christoph Hellwig <hch@lst.de>
To: Tony Luck <tony.luck@intel.com>, Fenghua Yu <fenghua.yu@intel.com>
Cc: linux-ia64@vger.kernel.org, iommu@lists.linux-foundation.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 7/9] ia64/sn2: remove no-ops dma sync methods
Date: Thu, 20 Sep 2018 09:26:58 +0200 [thread overview]
Message-ID: <20180920072700.22396-8-hch@lst.de> (raw)
In-Reply-To: <20180920072700.22396-1-hch@lst.de>
These do nothing but duplicating an assert that would have triggered
earlier on setting the dma mask, so remove them.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/ia64/sn/pci/pci_dma.c | 29 -----------------------------
1 file changed, 29 deletions(-)
diff --git a/arch/ia64/sn/pci/pci_dma.c b/arch/ia64/sn/pci/pci_dma.c
index 74c934a997bb..3b944fba0a3e 100644
--- a/arch/ia64/sn/pci/pci_dma.c
+++ b/arch/ia64/sn/pci/pci_dma.c
@@ -314,31 +314,6 @@ static int sn_dma_map_sg(struct device *dev, struct scatterlist *sgl,
return nhwentries;
}
-static void sn_dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,
- size_t size, enum dma_data_direction dir)
-{
- BUG_ON(!dev_is_pci(dev));
-}
-
-static void sn_dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle,
- size_t size,
- enum dma_data_direction dir)
-{
- BUG_ON(!dev_is_pci(dev));
-}
-
-static void sn_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
- int nelems, enum dma_data_direction dir)
-{
- BUG_ON(!dev_is_pci(dev));
-}
-
-static void sn_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
- int nelems, enum dma_data_direction dir)
-{
- BUG_ON(!dev_is_pci(dev));
-}
-
static int sn_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
{
return 0;
@@ -467,10 +442,6 @@ static struct dma_map_ops sn_dma_ops = {
.unmap_page = sn_dma_unmap_page,
.map_sg = sn_dma_map_sg,
.unmap_sg = sn_dma_unmap_sg,
- .sync_single_for_cpu = sn_dma_sync_single_for_cpu,
- .sync_sg_for_cpu = sn_dma_sync_sg_for_cpu,
- .sync_single_for_device = sn_dma_sync_single_for_device,
- .sync_sg_for_device = sn_dma_sync_sg_for_device,
.mapping_error = sn_dma_mapping_error,
.dma_supported = sn_dma_supported,
};
--
2.18.0
next prev parent reply other threads:[~2018-09-20 7:27 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-20 7:26 misc ia64 cleanups (resend) Christoph Hellwig
2018-09-20 7:26 ` [PATCH 1/9] ia64: remove the kern_mem_attribute export Christoph Hellwig
2018-09-20 7:26 ` [PATCH 2/9] ia64: remove the dead iommu_sac_force variable Christoph Hellwig
2018-09-20 7:26 ` [PATCH 3/9] ia64: remove iommu_dma_supported Christoph Hellwig
2018-09-20 7:26 ` [PATCH 4/9] ia64: remove the unused bad_dma_address symbol Christoph Hellwig
2018-09-20 7:26 ` [PATCH 5/9] ia64: remove the unused pci_iommu_shutdown function Christoph Hellwig
2018-09-20 7:26 ` [PATCH 6/9] ia64: remove the unused iommu_dma_init function Christoph Hellwig
2018-09-20 7:26 ` Christoph Hellwig [this message]
2018-09-20 7:26 ` [PATCH 8/9] ia64: remove machvec_dma_sync_{single,sg} Christoph Hellwig
2018-09-20 7:27 ` [PATCH 9/9] intel-iommu: mark intel_dma_ops static Christoph Hellwig
2018-09-20 16:44 ` misc ia64 cleanups (resend) Luck, Tony
-- strict thread matches above, loose matches on Subject: below --
2018-08-01 16:02 DMA related cleanups for IA64 Christoph Hellwig
2018-08-01 16:02 ` [PATCH 7/9] ia64/sn2: remove no-ops dma sync methods 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=20180920072700.22396-8-hch@lst.de \
--to=hch@lst.de \
--cc=fenghua.yu@intel.com \
--cc=iommu@lists.linux-foundation.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tony.luck@intel.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).