target/linux/brcm2708/patches-3.18/0057-Revert-ARM-dma-Use-dma_pfn_offset-for-dma-address-tr.patch

   1 From 48c48c4437603bad79eb848ac03b21a86cc3bb90 Mon Sep 17 00:00:00 2001
   2 From: popcornmix <popcornmix@gmail.com>
   3 Date: Thu, 7 Aug 2014 02:03:50 +0100
   4 Subject: [PATCH 057/114] Revert "ARM: dma: Use dma_pfn_offset for dma address
   5  translation"
   6
   7 This reverts commit 6ce0d20016925d031f1e24d64302e4c976d7cec6.
   8 ---
   9  arch/arm/include/asm/dma-mapping.h | 18 +-----------------
  10  1 file changed, 1 insertion(+), 17 deletions(-)
  11
  12 --- a/arch/arm/include/asm/dma-mapping.h
  13 +++ b/arch/arm/include/asm/dma-mapping.h
  14 @@ -58,37 +58,21 @@ static inline int dma_set_mask(struct de
  15  #ifndef __arch_pfn_to_dma
  16  static inline dma_addr_t pfn_to_dma(struct device *dev, unsigned long pfn)
  17  {
  18 -       if (dev)
  19 -               pfn -= dev->dma_pfn_offset;
  20         return (dma_addr_t)__pfn_to_bus(pfn);
  21  }
  22
  23  static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr)
  24  {
  25 -       unsigned long pfn = __bus_to_pfn(addr);
  26 -
  27 -       if (dev)
  28 -               pfn += dev->dma_pfn_offset;
  29 -
  30 -       return pfn;
  31 +       return __bus_to_pfn(addr);
  32  }
  33
  34  static inline void *dma_to_virt(struct device *dev, dma_addr_t addr)
  35  {
  36 -       if (dev) {
  37 -               unsigned long pfn = dma_to_pfn(dev, addr);
  38 -
  39 -               return phys_to_virt(__pfn_to_phys(pfn));
  40 -       }
  41 -
  42         return (void *)__bus_to_virt((unsigned long)addr);
  43  }
  44
  45  static inline dma_addr_t virt_to_dma(struct device *dev, void *addr)
  46  {
  47 -       if (dev)
  48 -               return pfn_to_dma(dev, virt_to_pfn(addr));
  49 -
  50         return (dma_addr_t)__virt_to_bus((unsigned long)(addr));
  51  }
  52