dma: replace single-char identifiers in macros
PATCH 1/1 dma: replace single-char identifiers in macros
There are a few macros in DMA have single-char identifiers make the code hard to read. Replace them with meaningful names.
Signed-off-by Qian Cai <[email protected]>
--- include/linux/dma-mapping.h | 24 ++++++++++++++++-------- include/linux/dmar.h | 14 ++++++++------ 2 files changed, 24 insertions(+), 14 deletions(-)
include/linux/dma-mapping.h +16 -8
@@ -602,14 +602,22 @@ static inline void dma_sync_single_range_for_device(struct device *dev,return dma_sync_single_for_device (dev, addr + offset, size, dir); } -#define dma_map_single (d, a, s, r) dma_map_single_attrs(d, a, s, r, 0) -#define dma_unmap_single (d, a, s, r) dma_unmap_single_attrs(d, a, s, r, 0) -#define dma_map_sg (d, s, n, r) dma_map_sg_attrs(d, s, n, r, 0) -#define dma_unmap_sg (d, s, n, r) dma_unmap_sg_attrs(d, s, n, r, 0) -#define dma_map_page (d, p, o, s, r) dma_map_page_attrs(d, p, o, s, r, 0) -#define dma_unmap_page (d, a, s, r) dma_unmap_page_attrs(d, a, s, r, 0) -#define dma_get_sgtable (d, t, v, h, s) dma_get_sgtable_attrs(d, t, v, h, s, 0) -#define dma_mmap_coherent (d, v, c, h, s) dma_mmap_attrs(d, v, c, h, s, 0) +#define dma_map_single (dev, ptr, size, direction) \ + dma_map_single_attrs(dev, ptr, size, direction, 0) +#define dma_unmap_single (dev, addr, size, direction) \ + dma_unmap_single_attrs(dev, addr, size, direction, 0) +#define dma_map_sg (dev, sg, mapped_ents, direction) \ + dma_map_sg_attrs(dev, sg, mapped_ents, direction, 0) +#define dma_unmap_sg (dev, sg, mapped_ents, direction) \ + dma_unmap_sg_attrs(dev, sg, mapped_ents, direction, 0) +#define dma_map_page (dev, page, offset, size, direction) \ + dma_map_page_attrs(dev, page, offset, size, direction, 0) +#define dma_unmap_page (dev, addr, size, direction) \ + dma_unmap_page_attrs(dev, addr, size, direction, 0) +#define dma_get_sgtable (dev, sgt, cpu_addr, dma_addr, size) \ + dma_get_sgtable_attrs(dev, sgt, cpu_addr, dma_addr, size, 0) +#define dma_mmap_coherent (dev, vma, cpu_addr, dma_addr, size) \ + dma_mmap_attrs(dev, vma, cpu_addr, dma_addr, size, 0) extern int dma_common_mmap(struct device *dev, struct vm_area_struct *vma, void *cpu_addr, dma_addr_t dma_addr, size_t size,
include/linux/dmar.h +8 -6
@@ -104,12 +104,14 @@ static inline bool dmar_rcu_check(void)#define dmar_rcu_dereference (p) rcu_dereference_check((p), dmar_rcu_check()) -#define for_each_dev_scope (a, c, p, d) \ - for ((p) = 0; ((d) = (p) < (c) ? dmar_rcu_dereference((a)[(p)].dev) : \ - NULL, (p) < (c)); (p)++) - -#define for_each_active_dev_scope (a, c, p, d) \ - for_each_dev_scope((a), (c), (p), (d)) if (!(d)) { continue; } else +#define for_each_dev_scope (devs, cnt, i, tmp) \ + for ((i) = 0; ((tmp) = (i) < (cnt) ? \ + dmar_rcu_dereference((devs)[(i)].dev) : NULL, (i) < (cnt)); \ + (i)++) + +#define for_each_active_dev_scope (devs, cnt, i, tmp) \ + for_each_dev_scope((devs), (cnt), (i), (tmp)) \ + if (!(tmp)) { continue; } elseextern int dmar_table_init (void );extern int dmar_dev_scope_init (void );
Signature · 1 line
1.8.3.1
Quoted 2 lines · Qian Cai
There are a few macros in DMA have single-char identifiers make the code hard to read. Replace them with meaningful names.
Well, this code isn't really supposed to be read much, it just has minimal stubs. and dmar.h is not related at all to the dma-mapping subsystem.