Commit 8e99469a authored Jan 20, 2016 by Geliang Tang Committed by Linus Torvalds Jan 20, 2016

dma-mapping: use offset_in_page macro



Use offset_in_page macro instead of (addr & ~PAGE_MASK).

Signed-off-by: Geliang Tang <geliangtang@163.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Joerg Roedel <jroedel@suse.de>
Cc: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 20d666e4

include/linux/dma-mapping.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -129,10 +129,10 @@ static inline dma_addr_t dma_map_single_attrs(struct device dev, void ptr,
		kmemcheck_mark_initialized(ptr, size);
		BUG_ON(!valid_dma_direction(dir));
		addr = ops->map_page(dev, virt_to_page(ptr),
		(unsigned long)ptr & ~PAGE_MASK, size,
		offset_in_page(ptr), size,
		dir, attrs);
		debug_dma_map_page(dev, virt_to_page(ptr),
		(unsigned long)ptr & ~PAGE_MASK, size,
		offset_in_page(ptr), size,
		dir, addr, true);
		return addr;
		}