diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-09-17 19:10:31 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2018-09-17 10:15:58 -0700 |
| commit | 02b4da5f84d157f6a27e05ca017bdb74bcf01bee (patch) | |
| tree | dc016e5ee22a79d175b50b449a7d8fcb7ae45687 | |
| parent | 9aa1fbc50d4f0165d4c9445a2ac80a2bf00fb667 (diff) | |
| download | linux-02b4da5f84d157f6a27e05ca017bdb74bcf01bee.tar.gz | |
intel-iommu: mark intel_dma_ops static
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> Signed-off-by: Tony Luck <tony.luck@intel.com>
| -rw-r--r-- | arch/ia64/kernel/pci-dma.c | 4 | ||||
| -rw-r--r-- | drivers/iommu/intel-iommu.c | 2 |
2 files changed, 1 insertions, 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 e72efef97924..0ee6516de41a 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -3895,7 +3895,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, |