diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2010-03-10 18:23:39 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 18:52:42 -0500 |
commit | 6a1961f49ee8d7339ea2454443dfc0460e0b2748 (patch) | |
tree | 057b03936a7dac1fd88d94c963bc52c3619c0022 /Documentation/DMA-API.txt | |
parent | e3c4bccabaf3e5c13f4b307c7737cbe8d0cecd02 (diff) |
dma-mapping: dma-mapping.h: add dma_set_coherent_mask
dma_set_coherent_mask corresponds to pci_set_consistent_dma_mask. This is
necessary to move to the generic device model DMA API from the PCI bus
specific API in the long term.
dma_set_coherent_mask works in the exact same way that
pci_set_consistent_dma_mask does. So this patch also changes
pci_set_consistent_dma_mask to call dma_set_coherent_mask.
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: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Greg KH <greg@kroah.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation/DMA-API.txt')
-rw-r--r-- | Documentation/DMA-API.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/DMA-API.txt b/Documentation/DMA-API.txt index 29a48fbae77..0fc5728ed48 100644 --- a/Documentation/DMA-API.txt +++ b/Documentation/DMA-API.txt | |||
@@ -167,6 +167,16 @@ parameters if it is. | |||
167 | 167 | ||
168 | Returns: 0 if successful and a negative error if not. | 168 | Returns: 0 if successful and a negative error if not. |
169 | 169 | ||
170 | int | ||
171 | dma_set_coherent_mask(struct device *dev, u64 mask) | ||
172 | int | ||
173 | pci_set_consistent_dma_mask(struct pci_device *dev, u64 mask) | ||
174 | |||
175 | Checks to see if the mask is possible and updates the device | ||
176 | parameters if it is. | ||
177 | |||
178 | Returns: 0 if successful and a negative error if not. | ||
179 | |||
170 | u64 | 180 | u64 |
171 | dma_get_required_mask(struct device *dev) | 181 | dma_get_required_mask(struct device *dev) |
172 | 182 | ||