diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2009-05-14 12:23:08 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-06-16 07:56:41 -0400 |
commit | b9f69f4f4a953b2b5299fff7fc98e69221e29514 (patch) | |
tree | 1b9093a0811c04162c07e39021afe0d4bb5977b6 /arch/sparc/include/asm/dma-mapping_32.h | |
parent | 0d76cb2606cbb2e21f3832773458bb0241f99c6d (diff) |
sparc: move the duplication in dma-mapping_{32|64}.h to dma-mapping.h
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Tested-by: Robert Reif <reif@earthlink.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include/asm/dma-mapping_32.h')
-rw-r--r-- | arch/sparc/include/asm/dma-mapping_32.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/sparc/include/asm/dma-mapping_32.h b/arch/sparc/include/asm/dma-mapping_32.h index 8a57ea0573e6..7f09c85103a5 100644 --- a/arch/sparc/include/asm/dma-mapping_32.h +++ b/arch/sparc/include/asm/dma-mapping_32.h | |||
@@ -7,10 +7,6 @@ struct device; | |||
7 | struct scatterlist; | 7 | struct scatterlist; |
8 | struct page; | 8 | struct page; |
9 | 9 | ||
10 | #define DMA_ERROR_CODE (~(dma_addr_t)0x0) | ||
11 | |||
12 | extern int dma_supported(struct device *dev, u64 mask); | ||
13 | extern int dma_set_mask(struct device *dev, u64 dma_mask); | ||
14 | extern void *dma_alloc_coherent(struct device *dev, size_t size, | 10 | extern void *dma_alloc_coherent(struct device *dev, size_t size, |
15 | dma_addr_t *dma_handle, gfp_t flag); | 11 | dma_addr_t *dma_handle, gfp_t flag); |
16 | extern void dma_free_coherent(struct device *dev, size_t size, | 12 | extern void dma_free_coherent(struct device *dev, size_t size, |
@@ -37,24 +33,10 @@ extern void dma_sync_single_for_device(struct device *dev, | |||
37 | dma_addr_t dma_handle, | 33 | dma_addr_t dma_handle, |
38 | size_t size, | 34 | size_t size, |
39 | enum dma_data_direction direction); | 35 | enum dma_data_direction direction); |
40 | extern void dma_sync_single_range_for_cpu(struct device *dev, | ||
41 | dma_addr_t dma_handle, | ||
42 | unsigned long offset, | ||
43 | size_t size, | ||
44 | enum dma_data_direction direction); | ||
45 | extern void dma_sync_single_range_for_device(struct device *dev, | ||
46 | dma_addr_t dma_handle, | ||
47 | unsigned long offset, size_t size, | ||
48 | enum dma_data_direction direction); | ||
49 | extern void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, | 36 | extern void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, |
50 | int nelems, enum dma_data_direction direction); | 37 | int nelems, enum dma_data_direction direction); |
51 | extern void dma_sync_sg_for_device(struct device *dev, | 38 | extern void dma_sync_sg_for_device(struct device *dev, |
52 | struct scatterlist *sg, int nelems, | 39 | struct scatterlist *sg, int nelems, |
53 | enum dma_data_direction direction); | 40 | enum dma_data_direction direction); |
54 | extern int dma_mapping_error(struct device *dev, dma_addr_t dma_addr); | ||
55 | extern int dma_get_cache_alignment(void); | ||
56 | |||
57 | #define dma_alloc_noncoherent dma_alloc_coherent | ||
58 | #define dma_free_noncoherent dma_free_coherent | ||
59 | 41 | ||
60 | #endif /* _ASM_SPARC_DMA_MAPPING_H */ | 42 | #endif /* _ASM_SPARC_DMA_MAPPING_H */ |