Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b67dd2e9 authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Russell King
Browse files

ARM: 8548/1: dma-mapping: remove arm_dma_set_mask() 



arm_dma_set_mask() implements exactly the same behavior as the fallback
that dma_set_mask() takes if the set_dma_mask op is not set. Remove it
and use that fallback instead like what is already done for
dma_get_mask().

Signed-off-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 903589ca

arch/arm/include/asm/dma-mapping.h

+0 −2
Original line number Diff line number Diff line
@@ -162,8 +162,6 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) 


static inline void dma_mark_clean(void *addr, size_t size) { }



extern int arm_dma_set_mask(struct device *dev, u64 dma_mask);



/**

 * arm_dma_alloc - allocate consistent memory for DMA

 * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices

arch/arm/mm/dma-mapping.c

+0 −16
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ struct dma_map_ops arm_dma_ops = { 
	.sync_single_for_device	= arm_dma_sync_single_for_device,

	.sync_sg_for_cpu	= arm_dma_sync_sg_for_cpu,

	.sync_sg_for_device	= arm_dma_sync_sg_for_device,

	.set_dma_mask		= arm_dma_set_mask,

};

EXPORT_SYMBOL(arm_dma_ops);
@@ -209,7 +208,6 @@ struct dma_map_ops arm_coherent_dma_ops = { 
	.get_sgtable		= arm_dma_get_sgtable,

	.map_page		= arm_coherent_dma_map_page,

	.map_sg			= arm_dma_map_sg,

	.set_dma_mask		= arm_dma_set_mask,

};

EXPORT_SYMBOL(arm_coherent_dma_ops);
@@ -1142,16 +1140,6 @@ int dma_supported(struct device *dev, u64 mask) 
}

EXPORT_SYMBOL(dma_supported);



int arm_dma_set_mask(struct device *dev, u64 dma_mask)

{

	if (!dev->dma_mask || !dma_supported(dev, dma_mask))

		return -EIO;



	*dev->dma_mask = dma_mask;



	return 0;

}



#define PREALLOC_DMA_DEBUG_ENTRIES	4096



static int __init dma_debug_do_init(void)
@@ -2005,8 +1993,6 @@ struct dma_map_ops iommu_ops = { 
	.unmap_sg		= arm_iommu_unmap_sg,

	.sync_sg_for_cpu	= arm_iommu_sync_sg_for_cpu,

	.sync_sg_for_device	= arm_iommu_sync_sg_for_device,



	.set_dma_mask		= arm_dma_set_mask,

};



struct dma_map_ops iommu_coherent_ops = {
@@ -2020,8 +2006,6 @@ struct dma_map_ops iommu_coherent_ops = { 


	.map_sg		= arm_coherent_iommu_map_sg,

	.unmap_sg	= arm_coherent_iommu_unmap_sg,



	.set_dma_mask	= arm_dma_set_mask,

};



/**