Skip to content

Commit

Permalink
Revert "ARM: dma: Use dma_pfn_offset for dma address translation"
Browse files Browse the repository at this point in the history
This reverts commit 6ce0d20.
  • Loading branch information
popcornmix committed May 1, 2015
1 parent 9d7ac0e commit d2a0039
Showing 1 changed file with 1 addition and 17 deletions.
18 changes: 1 addition & 17 deletions arch/arm/include/asm/dma-mapping.h
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down

0 comments on commit d2a0039

Please sign in to comment.