p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Christoph Hellwig 2018-09-17 19:10:31 +02:00 committed by Tony Luck
parent 9aa1fbc50d
commit 02b4da5f84
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/ia64/kernel/pci-dma.c
View File

@ -24,8 +24,6 @@ int force_iommu __read_mostly;
int iommu_pass_through; int iommu_pass_through;
extern struct dma_map_ops intel_dma_ops;
static int __init pci_iommu_init(void) static int __init pci_iommu_init(void)
{ {
if (iommu_detected) if (iommu_detected)
@ -39,8 +37,6 @@ fs_initcall(pci_iommu_init);
void __init pci_iommu_alloc(void) void __init pci_iommu_alloc(void)
{ {
dma_ops = &intel_dma_ops;
/* /*
* The order of these functions is important for * The order of these functions is important for
* fall-back/fail-over reasons * fall-back/fail-over reasons

2
drivers/iommu/intel-iommu.c
View File

@ -3895,7 +3895,7 @@ static int intel_mapping_error(struct device *dev, dma_addr_t dma_addr)
return !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, .alloc = intel_alloc_coherent,
.free = intel_free_coherent, .free = intel_free_coherent,
.map_sg = intel_map_sg, .map_sg = intel_map_sg,