diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2010-03-10 18:23:31 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 18:52:42 -0500 |
commit | 0acedc124aca35f5cce9d4ee288dc372bf517e09 (patch) | |
tree | 699113a95be38de29457d0cc71139d9c82efba3e /include/linux/dma-mapping.h | |
parent | f41b177157718abe9a93868bb76e47d4a6f3681d (diff) |
dma-mapping.h: add the dma_unmap state API
Adds the following macros:
DECLARE_DMA_UNMAP_ADDR(ADDR_NAME)
DECLARE_DMA_UNMAP_LEN(LEN_NAME)
dma_unmap_addr(PTR, ADDR_NAME)
dma_unmap_addr_set(PTR, ADDR_NAME, VAL)
dma_unmap_len(PTR, LEN_NAME)
dma_unmap_len_set(PTR, LEN_NAME, VAL)
The API corresponds to the pci_unmap state API. We'll move to this new
generic API from the PCI specific API in the long term. As
include/asm-generic/pci-dma-compat.h does, the pci_unmap API simply calls
the new generic API for some time.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: James Bottomley <James.Bottomley@suse.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/dma-mapping.h')
-rw-r--r-- | include/linux/dma-mapping.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 91b76184606..c5ac9d49cc0 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h | |||
@@ -232,4 +232,20 @@ struct dma_attrs; | |||
232 | 232 | ||
233 | #endif /* CONFIG_HAVE_DMA_ATTRS */ | 233 | #endif /* CONFIG_HAVE_DMA_ATTRS */ |
234 | 234 | ||
235 | #ifdef CONFIG_NEED_DMA_MAP_STATE | ||
236 | #define DEFINE_DMA_UNMAP_ADDR(ADDR_NAME) dma_addr_t ADDR_NAME | ||
237 | #define DEFINE_DMA_UNMAP_LEN(LEN_NAME) __u32 LEN_NAME | ||
238 | #define dma_unmap_addr(PTR, ADDR_NAME) ((PTR)->ADDR_NAME) | ||
239 | #define dma_unmap_addr_set(PTR, ADDR_NAME, VAL) (((PTR)->ADDR_NAME) = (VAL)) | ||
240 | #define dma_unmap_len(PTR, LEN_NAME) ((PTR)->LEN_NAME) | ||
241 | #define dma_unmap_len_set(PTR, LEN_NAME, VAL) (((PTR)->LEN_NAME) = (VAL)) | ||
242 | #else | ||
243 | #define DEFINE_DMA_UNMAP_ADDR(ADDR_NAME) | ||
244 | #define DEFINE_DMA_UNMAP_LEN(LEN_NAME) | ||
245 | #define dma_unmap_addr(PTR, ADDR_NAME) (0) | ||
246 | #define dma_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0) | ||
247 | #define dma_unmap_len(PTR, LEN_NAME) (0) | ||
248 | #define dma_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0) | ||
249 | #endif | ||
250 | |||
235 | #endif | 251 | #endif |