Skip to content

Commit

Permalink
dma-mapping: merge dma_unmap_page_attrs and dma_unmap_single_attrs
Browse files Browse the repository at this point in the history
The two functions are exactly the same, so don't bother implementing
them twice.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
Tested-by: Jesper Dangaard Brouer <brouer@redhat.com>
Tested-by: Tony Luck <tony.luck@intel.com>
  • Loading branch information
Christoph Hellwig committed Dec 13, 2018
1 parent 8d59b5f commit 7f0fee2
Showing 1 changed file with 6 additions and 13 deletions.
19 changes: 6 additions & 13 deletions include/linux/dma-mapping.h
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,12 @@ static inline void dma_unmap_single_attrs(struct device *dev, dma_addr_t addr,
debug_dma_unmap_page(dev, addr, size, dir, true);
}

static inline void dma_unmap_page_attrs(struct device *dev, dma_addr_t addr,
size_t size, enum dma_data_direction dir, unsigned long attrs)
{
return dma_unmap_single_attrs(dev, addr, size, dir, attrs);
}

/*
* dma_maps_sg_attrs returns 0 on error and > 0 on success.
* It should never return a value < 0.
Expand Down Expand Up @@ -300,19 +306,6 @@ static inline dma_addr_t dma_map_page_attrs(struct device *dev,
return addr;
}

static inline void dma_unmap_page_attrs(struct device *dev,
dma_addr_t addr, size_t size,
enum dma_data_direction dir,
unsigned long attrs)
{
const struct dma_map_ops *ops = get_dma_ops(dev);

BUG_ON(!valid_dma_direction(dir));
if (ops->unmap_page)
ops->unmap_page(dev, addr, size, dir, attrs);
debug_dma_unmap_page(dev, addr, size, dir, false);
}

static inline dma_addr_t dma_map_resource(struct device *dev,
phys_addr_t phys_addr,
size_t size,
Expand Down

0 comments on commit 7f0fee2

Please sign in to comment.