summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorpopcornmix <popcornmix@gmail.com>2014-08-07 02:03:50 +0100
committerpopcornmix <popcornmix@gmail.com>2015-05-18 14:11:14 +0100
commitf2b5a6b2beae0666bb9e9798a3b8f97c89ef74aa (patch)
tree133fc5c80c1de344b1375fd053d8e85c27fe36c4 /arch
parentf9a921c3fd709db9c77552eed0d6ed31dd203722 (diff)
downloadlinux-f2b5a6b2beae0666bb9e9798a3b8f97c89ef74aa.tar.gz
Revert "ARM: dma: Use dma_pfn_offset for dma address translation"
This reverts commit 6ce0d20016925d031f1e24d64302e4c976d7cec6.
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/include/asm/dma-mapping.h18
1 files changed, 1 insertions, 17 deletions
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
index b52101d37ec7..f5572d94a69a 100644
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
@@ -58,37 +58,21 @@ static inline int dma_set_mask(struct device *dev, u64 mask)
#ifndef __arch_pfn_to_dma
static inline dma_addr_t pfn_to_dma(struct device *dev, unsigned long pfn)
{
- if (dev)
- pfn -= dev->dma_pfn_offset;
return (dma_addr_t)__pfn_to_bus(pfn);
}
static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr)
{
- unsigned long pfn = __bus_to_pfn(addr);
-
- if (dev)
- pfn += dev->dma_pfn_offset;
-
- return pfn;
+ return __bus_to_pfn(addr);
}
static inline void *dma_to_virt(struct device *dev, dma_addr_t addr)
{
- if (dev) {
- unsigned long pfn = dma_to_pfn(dev, addr);
-
- return phys_to_virt(__pfn_to_phys(pfn));
- }
-
return (void *)__bus_to_virt((unsigned long)addr);
}
static inline dma_addr_t virt_to_dma(struct device *dev, void *addr)
{
- if (dev)
- return pfn_to_dma(dev, virt_to_pfn(addr));
-
return (dma_addr_t)__virt_to_bus((unsigned long)(addr));
}