aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjorn Helgaas <[email protected]>2022-05-24 16:42:21 -0500
committerBjorn Helgaas <[email protected]>2022-05-24 16:42:21 -0500
commite840e475397ed81f3885af563b1a725debf2a3ac (patch)
tree92575e64c5fb9b02adb23a2530e871b3c2f9624e
parent85ae3970a0e393cbb07ec30ac99d82cfd6c3f922 (diff)
parentf21949c1496807571ed3d09ed22e0ebeaec3e643 (diff)
Merge branch 'pci/misc'
- Change pci_set_dma_mask() documentation references to dma_set_mask() (Alex Williamson) * pci/misc: PCI/doc: Update obsolete pci_set_dma_mask() references
-rw-r--r--Documentation/PCI/pci.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/PCI/pci.rst b/Documentation/PCI/pci.rst
index 67a850b55617..cced568d78e9 100644
--- a/Documentation/PCI/pci.rst
+++ b/Documentation/PCI/pci.rst
@@ -273,12 +273,12 @@ Set the DMA mask size
While all drivers should explicitly indicate the DMA capability
(e.g. 32 or 64 bit) of the PCI bus master, devices with more than
32-bit bus master capability for streaming data need the driver
-to "register" this capability by calling pci_set_dma_mask() with
+to "register" this capability by calling dma_set_mask() with
appropriate parameters. In general this allows more efficient DMA
on systems where System RAM exists above 4G _physical_ address.
Drivers for all PCI-X and PCIe compliant devices must call
-set_dma_mask() as they are 64-bit DMA devices.
+dma_set_mask() as they are 64-bit DMA devices.
Similarly, drivers must also "register" this capability if the device
can directly address "coherent memory" in System RAM above 4G physical