p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

arm: dma-iommu: Clean up redundant variable 

mapping->size can be derived from mapping->bits << PAGE_SHIFT
which makes mapping->size as redundant.

Clean this up.

Signed-off-by: Ritesh Harjani <ritesh.harjani@gmail.com>
Reported-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
This commit is contained in:
Ritesh Harjani 2014-05-20 10:02:59 +05:30 committed by Marek Szyprowski
parent 7ee793a62f
commit 006f841db1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/include/asm/dma-iommu.h
View File

@ -18,7 +18,6 @@ struct dma_iommu_mapping {
unsigned int extensions; unsigned int extensions;
size_t bitmap_size; /* size of a single bitmap */ size_t bitmap_size; /* size of a single bitmap */
size_t bits; /* per bitmap */ size_t bits; /* per bitmap */
unsigned int size; /* per bitmap */
dma_addr_t base; dma_addr_t base;
spinlock_t lock; spinlock_t lock;

11
arch/arm/mm/dma-mapping.c
View File

@ -1074,6 +1074,7 @@ static inline dma_addr_t __alloc_iova(struct dma_iommu_mapping *mapping,
unsigned int order = get_order(size); unsigned int order = get_order(size);
unsigned int align = 0; unsigned int align = 0;
unsigned int count, start; unsigned int count, start;
size_t mapping_size = mapping->bits << PAGE_SHIFT;
unsigned long flags; unsigned long flags;
dma_addr_t iova; dma_addr_t iova;
int i; int i;
@ -1119,7 +1120,7 @@ static inline dma_addr_t __alloc_iova(struct dma_iommu_mapping *mapping,
} }
spin_unlock_irqrestore(&mapping->lock, flags); spin_unlock_irqrestore(&mapping->lock, flags);
iova = mapping->base + (mapping->size * i); iova = mapping->base + (mapping_size * i);
iova += start << PAGE_SHIFT; iova += start << PAGE_SHIFT;
return iova; return iova;
@ -1129,6 +1130,7 @@ static inline void __free_iova(struct dma_iommu_mapping *mapping,
dma_addr_t addr, size_t size) dma_addr_t addr, size_t size)
{ {
unsigned int start, count; unsigned int start, count;
size_t mapping_size = mapping->bits << PAGE_SHIFT;
unsigned long flags; unsigned long flags;
dma_addr_t bitmap_base; dma_addr_t bitmap_base;
u32 bitmap_index; u32 bitmap_index;
@ -1136,14 +1138,14 @@ static inline void __free_iova(struct dma_iommu_mapping *mapping,
if (!size) if (!size)
return; return;
bitmap_index = (u32) (addr - mapping->base) / (u32) mapping->size; bitmap_index = (u32) (addr - mapping->base) / (u32) mapping_size;
BUG_ON(addr < mapping->base || bitmap_index > mapping->extensions); BUG_ON(addr < mapping->base || bitmap_index > mapping->extensions);
bitmap_base = mapping->base + mapping->size * bitmap_index; bitmap_base = mapping->base + mapping_size * bitmap_index;
start = (addr - bitmap_base) >> PAGE_SHIFT; start = (addr - bitmap_base) >> PAGE_SHIFT;
if (addr + size > bitmap_base + mapping->size) { if (addr + size > bitmap_base + mapping_size) {
/* /*
* The address range to be freed reaches into the iova * The address range to be freed reaches into the iova
* range of the next bitmap. This should not happen as * range of the next bitmap. This should not happen as
@ -1964,7 +1966,6 @@ arm_iommu_create_mapping(struct bus_type *bus, dma_addr_t base, size_t size)
mapping->extensions = extensions; mapping->extensions = extensions;
mapping->base = base; mapping->base = base;
mapping->bits = BITS_PER_BYTE * bitmap_size; mapping->bits = BITS_PER_BYTE * bitmap_size;
mapping->size = mapping->bits << PAGE_SHIFT;
spin_lock_init(&mapping->lock); spin_lock_init(&mapping->lock);