-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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>
- Loading branch information
FUJITA Tomonori
authored and
Linus Torvalds
committed
Mar 12, 2010
1 parent
f41b177
commit 0acedc1
Showing
3 changed files
with
80 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,11 @@ | ||
#ifndef _LINUX_PCI_DMA_H | ||
#define _LINUX_PCI_DMA_H | ||
|
||
#ifdef CONFIG_NEED_DMA_MAP_STATE | ||
#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) dma_addr_t ADDR_NAME; | ||
#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) __u32 LEN_NAME; | ||
#define pci_unmap_addr(PTR, ADDR_NAME) ((PTR)->ADDR_NAME) | ||
#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) (((PTR)->ADDR_NAME) = (VAL)) | ||
#define pci_unmap_len(PTR, LEN_NAME) ((PTR)->LEN_NAME) | ||
#define pci_unmap_len_set(PTR, LEN_NAME, VAL) (((PTR)->LEN_NAME) = (VAL)) | ||
#else | ||
#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) | ||
#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) | ||
#define pci_unmap_addr(PTR, ADDR_NAME) (0) | ||
#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0) | ||
#define pci_unmap_len(PTR, LEN_NAME) (0) | ||
#define pci_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0) | ||
#endif | ||
#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) DEFINE_DMA_UNMAP_ADDR(ADDR_NAME); | ||
#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) DEFINE_DMA_UNMAP_LEN(LEN_NAME); | ||
#define pci_unmap_addr dma_unmap_addr | ||
#define pci_unmap_addr_set dma_unmap_addr_set | ||
#define pci_unmap_len dma_unmap_len | ||
#define pci_unmap_len_set dma_unmap_len_set | ||
|
||
#endif |