diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2010-05-26 17:44:18 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 12:12:52 -0400 |
commit | 38388301b7b9d2921b58cfa1cd9b14c02d508c63 (patch) | |
tree | 921b3379310e83ebef9fe4d47cb178ee928b4a85 | |
parent | 712d3e22a85156c00bd70dc35efe63e6765b122b (diff) |
swiotlb: remove unnecessary swiotlb_sync_single_range_*
swiotlb_sync_single_range_for_cpu and swiotlb_sync_single_range_for_device
are unnecessary because swiotlb_sync_single_for_cpu and
swiotlb_sync_single_for_device can be used instead.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/linux/swiotlb.h | 10 | ||||
-rw-r--r-- | lib/swiotlb.c | 31 |
2 files changed, 0 insertions, 41 deletions
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h index febedcf67c7e..81a4e213c6cf 100644 --- a/include/linux/swiotlb.h +++ b/include/linux/swiotlb.h | |||
@@ -73,16 +73,6 @@ extern void | |||
73 | swiotlb_sync_sg_for_device(struct device *hwdev, struct scatterlist *sg, | 73 | swiotlb_sync_sg_for_device(struct device *hwdev, struct scatterlist *sg, |
74 | int nelems, enum dma_data_direction dir); | 74 | int nelems, enum dma_data_direction dir); |
75 | 75 | ||
76 | extern void | ||
77 | swiotlb_sync_single_range_for_cpu(struct device *hwdev, dma_addr_t dev_addr, | ||
78 | unsigned long offset, size_t size, | ||
79 | enum dma_data_direction dir); | ||
80 | |||
81 | extern void | ||
82 | swiotlb_sync_single_range_for_device(struct device *hwdev, dma_addr_t dev_addr, | ||
83 | unsigned long offset, size_t size, | ||
84 | enum dma_data_direction dir); | ||
85 | |||
86 | extern int | 76 | extern int |
87 | swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t dma_addr); | 77 | swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t dma_addr); |
88 | 78 | ||
diff --git a/lib/swiotlb.c b/lib/swiotlb.c index 5fddf720da73..a009055140ec 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c | |||
@@ -757,37 +757,6 @@ swiotlb_sync_single_for_device(struct device *hwdev, dma_addr_t dev_addr, | |||
757 | EXPORT_SYMBOL(swiotlb_sync_single_for_device); | 757 | EXPORT_SYMBOL(swiotlb_sync_single_for_device); |
758 | 758 | ||
759 | /* | 759 | /* |
760 | * Same as above, but for a sub-range of the mapping. | ||
761 | */ | ||
762 | static void | ||
763 | swiotlb_sync_single_range(struct device *hwdev, dma_addr_t dev_addr, | ||
764 | unsigned long offset, size_t size, | ||
765 | int dir, int target) | ||
766 | { | ||
767 | swiotlb_sync_single(hwdev, dev_addr + offset, size, dir, target); | ||
768 | } | ||
769 | |||
770 | void | ||
771 | swiotlb_sync_single_range_for_cpu(struct device *hwdev, dma_addr_t dev_addr, | ||
772 | unsigned long offset, size_t size, | ||
773 | enum dma_data_direction dir) | ||
774 | { | ||
775 | swiotlb_sync_single_range(hwdev, dev_addr, offset, size, dir, | ||
776 | SYNC_FOR_CPU); | ||
777 | } | ||
778 | EXPORT_SYMBOL_GPL(swiotlb_sync_single_range_for_cpu); | ||
779 | |||
780 | void | ||
781 | swiotlb_sync_single_range_for_device(struct device *hwdev, dma_addr_t dev_addr, | ||
782 | unsigned long offset, size_t size, | ||
783 | enum dma_data_direction dir) | ||
784 | { | ||
785 | swiotlb_sync_single_range(hwdev, dev_addr, offset, size, dir, | ||
786 | SYNC_FOR_DEVICE); | ||
787 | } | ||
788 | EXPORT_SYMBOL_GPL(swiotlb_sync_single_range_for_device); | ||
789 | |||
790 | /* | ||
791 | * Map a set of buffers described by scatterlist in streaming mode for DMA. | 760 | * Map a set of buffers described by scatterlist in streaming mode for DMA. |
792 | * This is the scatter-gather version of the above swiotlb_map_page | 761 | * This is the scatter-gather version of the above swiotlb_map_page |
793 | * interface. Here the scatter gather list elements are each tagged with the | 762 | * interface. Here the scatter gather list elements are each tagged with the |