Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fd75a78 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Linus Torvalds
Browse files

dma-mapping: remove unnecessary sync_single_range_* in dma_map_ops 



sync_single_range_for_cpu and sync_single_range_for_device hooks are
unnecessary because sync_single_for_cpu and sync_single_for_device can
be used instead.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 38388301

include/asm-generic/dma-mapping-common.h

+2 −18
Original line number Diff line number Diff line
@@ -123,14 +123,6 @@ static inline void dma_sync_single_range_for_cpu(struct device *dev, 
						 size_t size,

						 enum dma_data_direction dir)

{

	struct dma_map_ops *ops = get_dma_ops(dev);



	BUG_ON(!valid_dma_direction(dir));

	if (ops->sync_single_range_for_cpu) {

		ops->sync_single_range_for_cpu(dev, addr, offset, size, dir);

		debug_dma_sync_single_range_for_cpu(dev, addr, offset, size, dir);



	} else

	dma_sync_single_for_cpu(dev, addr + offset, size, dir);

}
@@ -140,14 +132,6 @@ static inline void dma_sync_single_range_for_device(struct device *dev, 
						    size_t size,

						    enum dma_data_direction dir)

{

	struct dma_map_ops *ops = get_dma_ops(dev);



	BUG_ON(!valid_dma_direction(dir));

	if (ops->sync_single_range_for_device) {

		ops->sync_single_range_for_device(dev, addr, offset, size, dir);

		debug_dma_sync_single_range_for_device(dev, addr, offset, size, dir);



	} else

	dma_sync_single_for_device(dev, addr + offset, size, dir);

}

include/linux/dma-mapping.h

+0 −10
Original line number Diff line number Diff line
@@ -40,16 +40,6 @@ struct dma_map_ops { 
	void (*sync_single_for_device)(struct device *dev,

				       dma_addr_t dma_handle, size_t size,

				       enum dma_data_direction dir);

	void (*sync_single_range_for_cpu)(struct device *dev,

					  dma_addr_t dma_handle,

					  unsigned long offset,

					  size_t size,

					  enum dma_data_direction dir);

	void (*sync_single_range_for_device)(struct device *dev,

					     dma_addr_t dma_handle,

					     unsigned long offset,

					     size_t size,

					     enum dma_data_direction dir);

	void (*sync_sg_for_cpu)(struct device *dev,

				struct scatterlist *sg, int nents,

				enum dma_data_direction dir);