From: Christoph Hellwig <hch@lst.de>
To: Tony Luck <tony.luck@intel.com>, Fenghua Yu <fenghua.yu@intel.com>
Cc: David Woodhouse <dwmw2@infradead.org>,
linux-ia64@vger.kernel.org, linux-arch@vger.kernel.org,
linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org
Subject: [PATCH 9/9] intel-iommu: mark intel_dma_ops static
Date: Wed, 1 Aug 2018 18:02:52 +0200 [thread overview]
Message-ID: <20180801160252.25629-10-hch@lst.de> (raw)
In-Reply-To: <20180801160252.25629-1-hch@lst.de>
ia64 currently explicitly assigns it to dma_ops, but that same work is
already done by intel_iommu_init a little later, so we can remove the
duplicate assignment and mark the variable static.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/ia64/kernel/pci-dma.c | 4 ----
drivers/iommu/intel-iommu.c | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c
index 5a5bf5a82ac2..fe988c49f01c 100644
--- a/arch/ia64/kernel/pci-dma.c
+++ b/arch/ia64/kernel/pci-dma.c
@@ -24,8 +24,6 @@ int force_iommu __read_mostly;
int iommu_pass_through;
-extern struct dma_map_ops intel_dma_ops;
-
static int __init pci_iommu_init(void)
{
if (iommu_detected)
@@ -39,8 +37,6 @@ fs_initcall(pci_iommu_init);
void __init pci_iommu_alloc(void)
{
- dma_ops = &intel_dma_ops;
-
/*
* The order of these functions is important for
* fall-back/fail-over reasons
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 1be2609bd094..2da100e042fb 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -3889,7 +3889,7 @@ static int intel_mapping_error(struct device *dev, dma_addr_t dma_addr)
return !dma_addr;
}
-const struct dma_map_ops intel_dma_ops = {
+static const struct dma_map_ops intel_dma_ops = {
.alloc = intel_alloc_coherent,
.free = intel_free_coherent,
.map_sg = intel_map_sg,
--
2.18.0
next prev parent reply other threads:[~2018-08-01 16:03 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-01 16:02 DMA related cleanups for IA64 Christoph Hellwig
2018-08-01 16:02 ` [PATCH 1/9] ia64: remove the kern_mem_attribute export Christoph Hellwig
2018-08-01 16:02 ` [PATCH 2/9] ia64: remove the dead iommu_sac_force variable Christoph Hellwig
2018-08-01 16:02 ` [PATCH 3/9] ia64: remove iommu_dma_supported Christoph Hellwig
2018-08-01 16:02 ` [PATCH 4/9] ia64: remove the unused bad_dma_address symbol Christoph Hellwig
2018-08-01 16:02 ` [PATCH 5/9] ia64: remove the unused pci_iommu_shutdown function Christoph Hellwig
2018-08-01 16:02 ` [PATCH 6/9] ia64: remove the unused iommu_dma_init function Christoph Hellwig
2018-08-01 16:02 ` [PATCH 7/9] ia64/sn2: remove no-ops dma sync methods Christoph Hellwig
2018-08-01 16:02 ` [PATCH 8/9] ia64: remove machvec_dma_sync_{single,sg} Christoph Hellwig
2018-08-01 16:02 ` Christoph Hellwig [this message]
2018-08-07 13:53 ` DMA related cleanups for IA64 Christoph Hellwig
2018-09-20 7:26 misc ia64 cleanups (resend) Christoph Hellwig
2018-09-20 7:27 ` [PATCH 9/9] intel-iommu: mark intel_dma_ops static 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=20180801160252.25629-10-hch@lst.de \
--to=hch@lst.de \
--cc=dwmw2@infradead.org \
--cc=fenghua.yu@intel.com \
--cc=iommu@lists.linux-foundation.org \
--cc=linux-arch@vger.kernel.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).