diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-21 18:52:01 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-21 18:52:01 -0500 |
| commit | a4c80d2ae2cac531c6655f75658dae02c488abc7 (patch) | |
| tree | c6fe673620faf4b793064a9b2de17f70b7b69286 /include | |
| parent | 76be895001f2b0bee42a7685e942d3e08d5dd46c (diff) | |
| parent | 5b2afff23ab7f34222398fc357253c1e5caed363 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC32]: Spelling fixes
[SPARC64]: Spelling fixes
[SPARC64]: Fix OOPS in dma_sync_*_for_device()
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc64/dma-mapping.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/include/asm-sparc64/dma-mapping.h b/include/asm-sparc64/dma-mapping.h index 1fc655452b81..38cbec76a33f 100644 --- a/include/asm-sparc64/dma-mapping.h +++ b/include/asm-sparc64/dma-mapping.h | |||
| @@ -25,15 +25,9 @@ struct dma_ops { | |||
| 25 | void (*sync_single_for_cpu)(struct device *dev, | 25 | void (*sync_single_for_cpu)(struct device *dev, |
| 26 | dma_addr_t dma_handle, size_t size, | 26 | dma_addr_t dma_handle, size_t size, |
| 27 | enum dma_data_direction direction); | 27 | enum dma_data_direction direction); |
| 28 | void (*sync_single_for_device)(struct device *dev, | ||
| 29 | dma_addr_t dma_handle, size_t size, | ||
| 30 | enum dma_data_direction direction); | ||
| 31 | void (*sync_sg_for_cpu)(struct device *dev, struct scatterlist *sg, | 28 | void (*sync_sg_for_cpu)(struct device *dev, struct scatterlist *sg, |
| 32 | int nelems, | 29 | int nelems, |
| 33 | enum dma_data_direction direction); | 30 | enum dma_data_direction direction); |
| 34 | void (*sync_sg_for_device)(struct device *dev, struct scatterlist *sg, | ||
| 35 | int nelems, | ||
| 36 | enum dma_data_direction direction); | ||
| 37 | }; | 31 | }; |
| 38 | extern const struct dma_ops *dma_ops; | 32 | extern const struct dma_ops *dma_ops; |
| 39 | 33 | ||
| @@ -105,7 +99,7 @@ static inline void dma_sync_single_for_device(struct device *dev, | |||
| 105 | size_t size, | 99 | size_t size, |
| 106 | enum dma_data_direction direction) | 100 | enum dma_data_direction direction) |
| 107 | { | 101 | { |
| 108 | dma_ops->sync_single_for_device(dev, dma_handle, size, direction); | 102 | /* No flushing needed to sync cpu writes to the device. */ |
| 109 | } | 103 | } |
| 110 | 104 | ||
| 111 | static inline void dma_sync_single_range_for_cpu(struct device *dev, | 105 | static inline void dma_sync_single_range_for_cpu(struct device *dev, |
| @@ -123,7 +117,7 @@ static inline void dma_sync_single_range_for_device(struct device *dev, | |||
| 123 | size_t size, | 117 | size_t size, |
| 124 | enum dma_data_direction direction) | 118 | enum dma_data_direction direction) |
| 125 | { | 119 | { |
| 126 | dma_sync_single_for_device(dev, dma_handle+offset, size, direction); | 120 | /* No flushing needed to sync cpu writes to the device. */ |
| 127 | } | 121 | } |
| 128 | 122 | ||
| 129 | 123 | ||
| @@ -138,7 +132,7 @@ static inline void dma_sync_sg_for_device(struct device *dev, | |||
| 138 | struct scatterlist *sg, int nelems, | 132 | struct scatterlist *sg, int nelems, |
| 139 | enum dma_data_direction direction) | 133 | enum dma_data_direction direction) |
| 140 | { | 134 | { |
| 141 | dma_ops->sync_sg_for_device(dev, sg, nelems, direction); | 135 | /* No flushing needed to sync cpu writes to the device. */ |
| 142 | } | 136 | } |
| 143 | 137 | ||
| 144 | static inline int dma_mapping_error(dma_addr_t dma_addr) | 138 | static inline int dma_mapping_error(dma_addr_t dma_addr) |