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 diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
  13 index 85738b2..9477f09 100644
  14 --- a/arch/arm/include/asm/dma-mapping.h
  15 +++ b/arch/arm/include/asm/dma-mapping.h
  16 @@ -58,37 +58,21 @@ static inline int dma_set_mask(struct device *dev, u64 mask)
  17  #ifndef __arch_pfn_to_dma
  18  static inline dma_addr_t pfn_to_dma(struct device *dev, unsigned long pfn)
  19  {
  20 -       if (dev)
  21 -               pfn -= dev->dma_pfn_offset;
  22         return (dma_addr_t)__pfn_to_bus(pfn);
  23  }
  24
  25  static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr)
  26  {
  27 -       unsigned long pfn = __bus_to_pfn(addr);
  28 -
  29 -       if (dev)
  30 -               pfn += dev->dma_pfn_offset;
  31 -
  32 -       return pfn;
  33 +       return __bus_to_pfn(addr);
  34  }
  35
  36  static inline void *dma_to_virt(struct device *dev, dma_addr_t addr)
  37  {
  38 -       if (dev) {
  39 -               unsigned long pfn = dma_to_pfn(dev, addr);
  40 -
  41 -               return phys_to_virt(__pfn_to_phys(pfn));
  42 -       }
  43 -
  44         return (void *)__bus_to_virt((unsigned long)addr);
  45  }
  46
  47  static inline dma_addr_t virt_to_dma(struct device *dev, void *addr)
  48  {
  49 -       if (dev)
  50 -               return pfn_to_dma(dev, virt_to_pfn(addr));
  51 -
  52         return (dma_addr_t)__virt_to_bus((unsigned long)(addr));
  53  }
  54
  55 --
  56 1.8.3.2
  57