aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/DMA-API.txt
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-05-20 22:56:27 (GMT)
committerBjorn Helgaas <bhelgaas@google.com>2014-05-26 23:28:27 (GMT)
commitf311a724a79669ac0336932d0361325afdb54279 (patch)
tree1f86a93a676d25961f692ca5966ea1decb0a867f /Documentation/DMA-API.txt
parentace4b3fd67e771951d495aa1f1b1000984083362 (diff)
downloadkernel_replicant_linux-f311a724a79669ac0336932d0361325afdb54279.zip
kernel_replicant_linux-f311a724a79669ac0336932d0361325afdb54279.tar.gz
kernel_replicant_linux-f311a724a79669ac0336932d0361325afdb54279.tar.bz2
DMA-API: Capitalize "CPU" consistently
Sometimes we used "cpu," other times "CPU." Use "CPU" consistently. Suggested-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'Documentation/DMA-API.txt')
-rw-r--r--Documentation/DMA-API.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/DMA-API.txt b/Documentation/DMA-API.txt
index 4f1cdc5..5208840 100644
--- a/Documentation/DMA-API.txt
+++ b/Documentation/DMA-API.txt
@@ -19,7 +19,7 @@ To get the dma_ API, you must #include <linux/dma-mapping.h>. This
provides dma_addr_t and the interfaces described below.
A dma_addr_t can hold any valid DMA or bus address for the platform. It
-can be given to a device to use as a DMA source or target. A cpu cannot
+can be given to a device to use as a DMA source or target. A CPU cannot
reference a dma_addr_t directly because there may be translation between
its physical address space and the bus address space.
@@ -112,7 +112,7 @@ size and alignment requirements specified at creation time. Pass
GFP_ATOMIC to prevent blocking, or if it's permitted (not
in_interrupt, not holding SMP locks), pass GFP_KERNEL to allow
blocking. Like dma_alloc_coherent(), this returns two values: an
-address usable by the cpu, and the DMA address usable by the pool's
+address usable by the CPU, and the DMA address usable by the pool's
device.
@@ -120,7 +120,7 @@ device.
dma_addr_t addr);
This puts memory back into the pool. The pool is what was passed to
-dma_pool_alloc(); the cpu (vaddr) and DMA addresses are what
+dma_pool_alloc(); the CPU (vaddr) and DMA addresses are what
were returned when that routine allocated the memory being freed.
@@ -355,7 +355,7 @@ void
dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems,
enum dma_data_direction direction)
-Synchronise a single contiguous or scatter/gather mapping for the cpu
+Synchronise a single contiguous or scatter/gather mapping for the CPU
and device. With the sync_sg API, all the parameters must be the same
as those passed into the single mapping API. With the sync_single API,
you can use dma_handle and size parameters that aren't identical to
@@ -504,8 +504,8 @@ dma_declare_coherent_memory(struct device *dev, phys_addr_t phys_addr,
Declare region of memory to be handed out by dma_alloc_coherent() when
it's asked for coherent memory for this device.
-phys_addr is the cpu physical address to which the memory is currently
-assigned (this will be ioremapped so the cpu can access the region).
+phys_addr is the CPU physical address to which the memory is currently
+assigned (this will be ioremapped so the CPU can access the region).
device_addr is the bus address the device needs to be programmed
with to actually address this memory (this will be handed out as the