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>

diff --git a/arch/arm/include/asm/device.h b/arch/arm/include/asm/device.h
index 8754c0f5fc9041b99f97b5f298c00be6ea7b2353..c6beb1708c64b5627cf858778bf6fba378a421f0 100644 (file)
--- 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 bfc7476f141145c7bccbc0ffaffb7e9057512a80..f60d6b4afe5df75b62ef2310ffdbba9bf5bf1365 100644 (file)
--- 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