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 | 5fd75a7850b5156aa93c9fb6404adb8f563b6e02 (patch) | |
tree | 1b5f21a907eb8182e2642c7dee73274d04d24a07 /include/asm-generic/dma-mapping-common.h | |
parent | 38388301b7b9d2921b58cfa1cd9b14c02d508c63 (diff) |
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: 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>
Diffstat (limited to 'include/asm-generic/dma-mapping-common.h')
-rw-r--r-- | include/asm-generic/dma-mapping-common.h | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/include/asm-generic/dma-mapping-common.h b/include/asm-generic/dma-mapping-common.h index 69206957b72c..0c80bb38773f 100644 --- a/include/asm-generic/dma-mapping-common.h +++ b/include/asm-generic/dma-mapping-common.h | |||
@@ -123,15 +123,7 @@ static inline void dma_sync_single_range_for_cpu(struct device *dev, | |||
123 | size_t size, | 123 | size_t size, |
124 | enum dma_data_direction dir) | 124 | enum dma_data_direction dir) |
125 | { | 125 | { |
126 | struct dma_map_ops *ops = get_dma_ops(dev); | 126 | dma_sync_single_for_cpu(dev, addr + offset, size, dir); |
127 | |||
128 | BUG_ON(!valid_dma_direction(dir)); | ||
129 | if (ops->sync_single_range_for_cpu) { | ||
130 | ops->sync_single_range_for_cpu(dev, addr, offset, size, dir); | ||
131 | debug_dma_sync_single_range_for_cpu(dev, addr, offset, size, dir); | ||
132 | |||
133 | } else | ||
134 | dma_sync_single_for_cpu(dev, addr + offset, size, dir); | ||
135 | } | 127 | } |
136 | 128 | ||
137 | static inline void dma_sync_single_range_for_device(struct device *dev, | 129 | static inline void dma_sync_single_range_for_device(struct device *dev, |
@@ -140,15 +132,7 @@ static inline void dma_sync_single_range_for_device(struct device *dev, | |||
140 | size_t size, | 132 | size_t size, |
141 | enum dma_data_direction dir) | 133 | enum dma_data_direction dir) |
142 | { | 134 | { |
143 | struct dma_map_ops *ops = get_dma_ops(dev); | 135 | dma_sync_single_for_device(dev, addr + offset, size, dir); |
144 | |||
145 | BUG_ON(!valid_dma_direction(dir)); | ||
146 | if (ops->sync_single_range_for_device) { | ||
147 | ops->sync_single_range_for_device(dev, addr, offset, size, dir); | ||
148 | debug_dma_sync_single_range_for_device(dev, addr, offset, size, dir); | ||
149 | |||
150 | } else | ||
151 | dma_sync_single_for_device(dev, addr + offset, size, dir); | ||
152 | } | 136 | } |
153 | 137 | ||
154 | static inline void | 138 | static inline void |