From: Christoph Hellwig Date: Thu, 6 Oct 2022 07:43:01 +0000 (+0200) Subject: ARM/dma-mapping: remove the dma_coherent member of struct dev_archdata X-Git-Tag: v6.1-rc1~77^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c9cb01369b926a074004714ab9f9b65f75bf3c60;p=thirdparty%2Flinux.git 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 Reviewed-by: Russell King (Oracle) --- diff --git a/arch/arm/include/asm/device.h b/arch/arm/include/asm/device.h index 8754c0f5fc904..c6beb1708c64b 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 bfc7476f14114..f60d6b4afe5df 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