diff options
| author |   Christoph Hellwig <hch@lst.de> | 2022-10-06 09:43:01 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2022-10-06 14:31:08 +0200 |
| commit | c9cb01369b926a074004714ab9f9b65f75bf3c60 (patch) | |
| tree | 5cd90ac54f6b4912892eae6f4ed627f941ac6afe /arch/arm | |
| parent | ARM/dma-mappіng: don't override ->dma_coherent when set from a bus notifier (diff) | |
| download | linux-dev-c9cb01369b926a074004714ab9f9b65f75bf3c60.tar.xz linux-dev-c9cb01369b926a074004714ab9f9b65f75bf3c60.zip | |
ARM/dma-mapping: remove the dma_coherent member of struct dev_archdata
Since commit ae626eb97376 ("ARM/dma-mapping: use dma-direct
unconditionally") only the dma_coherent flag in struct device is used,
so remove the now write only flag in struct dev_archdata.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/include/asm/device.h | 1 | ||||
| -rw-r--r-- | arch/arm/mm/dma-mapping.c | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/include/asm/device.h b/arch/arm/include/asm/device.h index 8754c0f5fc90..c6beb1708c64 100644 --- a/arch/arm/include/asm/device.h +++ b/arch/arm/include/asm/device.h @@ -9,7 +9,6 @@ struct dev_archdata { #ifdef CONFIG_ARM_DMA_USE_IOMMU struct dma_iommu_mapping *mapping; #endif - unsigned int dma_coherent:1; unsigned int dma_ops_setup:1; }; diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index bfc7476f1411..f60d6b4afe5d 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -1775,10 +1775,8 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, * here, but instead have to make sure we only set but never clear it * for now. */ - if (coherent) { - dev->archdata.dma_coherent = true; + if (coherent) dev->dma_coherent = true; - } /* * Don't override the dma_ops if they have already been set. Ideally |