diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/parisc/sba_iommu.c | 18 | ||||
-rw-r--r-- | drivers/staging/altpciechdma/altpciechdma.c | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c index 3fac8f81d59d..a70cf16ee1ad 100644 --- a/drivers/parisc/sba_iommu.c +++ b/drivers/parisc/sba_iommu.c | |||
@@ -668,7 +668,7 @@ sba_mark_invalid(struct ioc *ioc, dma_addr_t iova, size_t byte_cnt) | |||
668 | * @dev: instance of PCI owned by the driver that's asking | 668 | * @dev: instance of PCI owned by the driver that's asking |
669 | * @mask: number of address bits this PCI device can handle | 669 | * @mask: number of address bits this PCI device can handle |
670 | * | 670 | * |
671 | * See Documentation/DMA-mapping.txt | 671 | * See Documentation/PCI/PCI-DMA-mapping.txt |
672 | */ | 672 | */ |
673 | static int sba_dma_supported( struct device *dev, u64 mask) | 673 | static int sba_dma_supported( struct device *dev, u64 mask) |
674 | { | 674 | { |
@@ -680,8 +680,8 @@ static int sba_dma_supported( struct device *dev, u64 mask) | |||
680 | return(0); | 680 | return(0); |
681 | } | 681 | } |
682 | 682 | ||
683 | /* Documentation/DMA-mapping.txt tells drivers to try 64-bit first, | 683 | /* Documentation/PCI/PCI-DMA-mapping.txt tells drivers to try 64-bit |
684 | * then fall back to 32-bit if that fails. | 684 | * first, then fall back to 32-bit if that fails. |
685 | * We are just "encouraging" 32-bit DMA masks here since we can | 685 | * We are just "encouraging" 32-bit DMA masks here since we can |
686 | * never allow IOMMU bypass unless we add special support for ZX1. | 686 | * never allow IOMMU bypass unless we add special support for ZX1. |
687 | */ | 687 | */ |
@@ -706,7 +706,7 @@ static int sba_dma_supported( struct device *dev, u64 mask) | |||
706 | * @size: number of bytes to map in driver buffer. | 706 | * @size: number of bytes to map in driver buffer. |
707 | * @direction: R/W or both. | 707 | * @direction: R/W or both. |
708 | * | 708 | * |
709 | * See Documentation/DMA-mapping.txt | 709 | * See Documentation/PCI/PCI-DMA-mapping.txt |
710 | */ | 710 | */ |
711 | static dma_addr_t | 711 | static dma_addr_t |
712 | sba_map_single(struct device *dev, void *addr, size_t size, | 712 | sba_map_single(struct device *dev, void *addr, size_t size, |
@@ -785,7 +785,7 @@ sba_map_single(struct device *dev, void *addr, size_t size, | |||
785 | * @size: number of bytes mapped in driver buffer. | 785 | * @size: number of bytes mapped in driver buffer. |
786 | * @direction: R/W or both. | 786 | * @direction: R/W or both. |
787 | * | 787 | * |
788 | * See Documentation/DMA-mapping.txt | 788 | * See Documentation/PCI/PCI-DMA-mapping.txt |
789 | */ | 789 | */ |
790 | static void | 790 | static void |
791 | sba_unmap_single(struct device *dev, dma_addr_t iova, size_t size, | 791 | sba_unmap_single(struct device *dev, dma_addr_t iova, size_t size, |
@@ -861,7 +861,7 @@ sba_unmap_single(struct device *dev, dma_addr_t iova, size_t size, | |||
861 | * @size: number of bytes mapped in driver buffer. | 861 | * @size: number of bytes mapped in driver buffer. |
862 | * @dma_handle: IOVA of new buffer. | 862 | * @dma_handle: IOVA of new buffer. |
863 | * | 863 | * |
864 | * See Documentation/DMA-mapping.txt | 864 | * See Documentation/PCI/PCI-DMA-mapping.txt |
865 | */ | 865 | */ |
866 | static void *sba_alloc_consistent(struct device *hwdev, size_t size, | 866 | static void *sba_alloc_consistent(struct device *hwdev, size_t size, |
867 | dma_addr_t *dma_handle, gfp_t gfp) | 867 | dma_addr_t *dma_handle, gfp_t gfp) |
@@ -892,7 +892,7 @@ static void *sba_alloc_consistent(struct device *hwdev, size_t size, | |||
892 | * @vaddr: virtual address IOVA of "consistent" buffer. | 892 | * @vaddr: virtual address IOVA of "consistent" buffer. |
893 | * @dma_handler: IO virtual address of "consistent" buffer. | 893 | * @dma_handler: IO virtual address of "consistent" buffer. |
894 | * | 894 | * |
895 | * See Documentation/DMA-mapping.txt | 895 | * See Documentation/PCI/PCI-DMA-mapping.txt |
896 | */ | 896 | */ |
897 | static void | 897 | static void |
898 | sba_free_consistent(struct device *hwdev, size_t size, void *vaddr, | 898 | sba_free_consistent(struct device *hwdev, size_t size, void *vaddr, |
@@ -927,7 +927,7 @@ int dump_run_sg = 0; | |||
927 | * @nents: number of entries in list | 927 | * @nents: number of entries in list |
928 | * @direction: R/W or both. | 928 | * @direction: R/W or both. |
929 | * | 929 | * |
930 | * See Documentation/DMA-mapping.txt | 930 | * See Documentation/PCI/PCI-DMA-mapping.txt |
931 | */ | 931 | */ |
932 | static int | 932 | static int |
933 | sba_map_sg(struct device *dev, struct scatterlist *sglist, int nents, | 933 | sba_map_sg(struct device *dev, struct scatterlist *sglist, int nents, |
@@ -1011,7 +1011,7 @@ sba_map_sg(struct device *dev, struct scatterlist *sglist, int nents, | |||
1011 | * @nents: number of entries in list | 1011 | * @nents: number of entries in list |
1012 | * @direction: R/W or both. | 1012 | * @direction: R/W or both. |
1013 | * | 1013 | * |
1014 | * See Documentation/DMA-mapping.txt | 1014 | * See Documentation/PCI/PCI-DMA-mapping.txt |
1015 | */ | 1015 | */ |
1016 | static void | 1016 | static void |
1017 | sba_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents, | 1017 | sba_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents, |
diff --git a/drivers/staging/altpciechdma/altpciechdma.c b/drivers/staging/altpciechdma/altpciechdma.c index 8e2b4ca0651d..f516140ca976 100644 --- a/drivers/staging/altpciechdma/altpciechdma.c +++ b/drivers/staging/altpciechdma/altpciechdma.c | |||
@@ -531,7 +531,7 @@ static int __devinit dma_test(struct ape_dev *ape, struct pci_dev *dev) | |||
531 | goto fail; | 531 | goto fail; |
532 | 532 | ||
533 | /* allocate and map coherently-cached memory for a DMA-able buffer */ | 533 | /* allocate and map coherently-cached memory for a DMA-able buffer */ |
534 | /* @see 2.6.26.2/Documentation/DMA-mapping.txt line 318 */ | 534 | /* @see Documentation/PCI/PCI-DMA-mapping.txt, near line 318 */ |
535 | buffer_virt = (u8 *)pci_alloc_consistent(dev, PAGE_SIZE * 4, &buffer_bus); | 535 | buffer_virt = (u8 *)pci_alloc_consistent(dev, PAGE_SIZE * 4, &buffer_bus); |
536 | if (!buffer_virt) { | 536 | if (!buffer_virt) { |
537 | printk(KERN_DEBUG "Could not allocate coherent DMA buffer.\n"); | 537 | printk(KERN_DEBUG "Could not allocate coherent DMA buffer.\n"); |
@@ -846,7 +846,7 @@ static int __devinit probe(struct pci_dev *dev, const struct pci_device_id *id) | |||
846 | 846 | ||
847 | #if 1 // @todo For now, disable 64-bit, because I do not understand the implications (DAC!) | 847 | #if 1 // @todo For now, disable 64-bit, because I do not understand the implications (DAC!) |
848 | /* query for DMA transfer */ | 848 | /* query for DMA transfer */ |
849 | /* @see Documentation/DMA-mapping.txt */ | 849 | /* @see Documentation/PCI/PCI-DMA-mapping.txt */ |
850 | if (!pci_set_dma_mask(dev, DMA_64BIT_MASK)) { | 850 | if (!pci_set_dma_mask(dev, DMA_64BIT_MASK)) { |
851 | pci_set_consistent_dma_mask(dev, DMA_64BIT_MASK); | 851 | pci_set_consistent_dma_mask(dev, DMA_64BIT_MASK); |
852 | /* use 64-bit DMA */ | 852 | /* use 64-bit DMA */ |