diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-12-22 10:58:24 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2018-01-10 16:41:14 +0100 |
| commit | 2d9d6f6c9e8ae9490a8df8727f7e00310a5efb5f (patch) | |
| tree | 456f9f6971b71947398fd2b399d3e2c686997674 /arch/powerpc/sysdev | |
| parent | bf15f90b07de75a0873bee7e41b138961c049137 (diff) | |
| download | linux-stable-2d9d6f6c9e8ae9490a8df8727f7e00310a5efb5f.tar.gz linux-stable-2d9d6f6c9e8ae9490a8df8727f7e00310a5efb5f.tar.bz2 linux-stable-2d9d6f6c9e8ae9490a8df8727f7e00310a5efb5f.zip | |
powerpc: rename dma_direct_ to dma_nommu_
We want to use the dma_direct_ namespace for a generic implementation,
so rename powerpc to the second best choice: dma_nommu_.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/dart_iommu.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/fsl_pci.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c index 3573d54b2770..a6198d4f0f03 100644 --- a/arch/powerpc/sysdev/dart_iommu.c +++ b/arch/powerpc/sysdev/dart_iommu.c @@ -402,7 +402,7 @@ static int dart_dma_set_mask(struct device *dev, u64 dma_mask) */ if (dart_device_on_pcie(dev) && dma_mask >= DMA_BIT_MASK(40)) { dev_info(dev, "Using 64-bit DMA iommu bypass\n"); - set_dma_ops(dev, &dma_direct_ops); + set_dma_ops(dev, &dma_nommu_ops); } else { dev_info(dev, "Using 32-bit DMA via iommu\n"); set_dma_ops(dev, &dma_iommu_ops); @@ -446,7 +446,7 @@ void __init iommu_init_early_dart(struct pci_controller_ops *controller_ops) controller_ops->dma_bus_setup = NULL; /* Setup pci_dma ops */ - set_pci_dma_ops(&dma_direct_ops); + set_pci_dma_ops(&dma_nommu_ops); } #ifdef CONFIG_PM diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index 22d98057f773..e4d0133bbeeb 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -135,7 +135,7 @@ static int fsl_pci_dma_set_mask(struct device *dev, u64 dma_mask) * mapping that allows addressing any RAM address from across PCI. */ if (dev_is_pci(dev) && dma_mask >= pci64_dma_offset * 2 - 1) { - set_dma_ops(dev, &dma_direct_ops); + set_dma_ops(dev, &dma_nommu_ops); set_dma_offset(dev, pci64_dma_offset); } |