Skip to content

Commit 8829428

Browse files
committed
parisc: ccio-dma: Fix kdoc and compiler warnings
Signed-off-by: Helge Deller <[email protected]>
1 parent f28a987 commit 8829428

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

drivers/parisc/ccio-dma.c

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@
9797
#define DBG_RUN_SG(x...)
9898
#endif
9999

100-
#define CCIO_INLINE inline
101100
#define WRITE_U32(value, addr) __raw_writel(value, addr)
102101
#define READ_U32(addr) __raw_readl(addr)
103102

@@ -330,7 +329,8 @@ static int ioc_count;
330329
/**
331330
* ccio_alloc_range - Allocate pages in the ioc's resource map.
332331
* @ioc: The I/O Controller.
333-
* @pages_needed: The requested number of pages to be mapped into the
332+
* @dev: The PCI device.
333+
* @size: The requested number of bytes to be mapped into the
334334
* I/O Pdir...
335335
*
336336
* This function searches the resource map of the ioc to locate a range
@@ -552,7 +552,7 @@ static u32 hint_lookup[] = {
552552
* (Load Coherence Index) instruction. The 8 bits used for the virtual
553553
* index are bits 12:19 of the value returned by LCI.
554554
*/
555-
static void CCIO_INLINE
555+
static void
556556
ccio_io_pdir_entry(u64 *pdir_ptr, space_t sid, unsigned long vba,
557557
unsigned long hints)
558558
{
@@ -623,7 +623,7 @@ ccio_io_pdir_entry(u64 *pdir_ptr, space_t sid, unsigned long vba,
623623
*
624624
* FIXME: Can we change the byte_cnt to pages_mapped?
625625
*/
626-
static CCIO_INLINE void
626+
static void
627627
ccio_clear_io_tlb(struct ioc *ioc, dma_addr_t iovp, size_t byte_cnt)
628628
{
629629
u32 chain_size = 1 << ioc->chainid_shift;
@@ -656,7 +656,7 @@ ccio_clear_io_tlb(struct ioc *ioc, dma_addr_t iovp, size_t byte_cnt)
656656
*
657657
* FIXME: Can we change byte_cnt to pages_mapped?
658658
*/
659-
static CCIO_INLINE void
659+
static void
660660
ccio_mark_invalid(struct ioc *ioc, dma_addr_t iova, size_t byte_cnt)
661661
{
662662
u32 iovp = (u32)CCIO_IOVP(iova);
@@ -795,9 +795,10 @@ ccio_map_page(struct device *dev, struct page *page, unsigned long offset,
795795
/**
796796
* ccio_unmap_page - Unmap an address range from the IOMMU.
797797
* @dev: The PCI device.
798-
* @addr: The start address of the DMA region.
798+
* @iova: The start address of the DMA region.
799799
* @size: The length of the DMA region.
800800
* @direction: The direction of the DMA transaction (to/from device).
801+
* @attrs: attributes
801802
*/
802803
static void
803804
ccio_unmap_page(struct device *dev, dma_addr_t iova, size_t size,
@@ -838,6 +839,8 @@ ccio_unmap_page(struct device *dev, dma_addr_t iova, size_t size,
838839
* @dev: The PCI device.
839840
* @size: The length of the DMA region.
840841
* @dma_handle: The DMA address handed back to the device (not the cpu).
842+
* @flag: allocation flags
843+
* @attrs: attributes
841844
*
842845
* This function implements the pci_alloc_consistent function.
843846
*/
@@ -872,6 +875,7 @@ ccio_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag,
872875
* @size: The length of the DMA region.
873876
* @cpu_addr: The cpu address returned from the ccio_alloc_consistent.
874877
* @dma_handle: The device address returned from the ccio_alloc_consistent.
878+
* @attrs: attributes
875879
*
876880
* This function implements the pci_free_consistent function.
877881
*/
@@ -901,6 +905,7 @@ ccio_free(struct device *dev, size_t size, void *cpu_addr,
901905
* @sglist: The scatter/gather list to be mapped in the IOMMU.
902906
* @nents: The number of entries in the scatter/gather list.
903907
* @direction: The direction of the DMA transaction (to/from device).
908+
* @attrs: attributes
904909
*
905910
* This function implements the pci_map_sg function.
906911
*/
@@ -980,6 +985,7 @@ ccio_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
980985
* @sglist: The scatter/gather list to be unmapped from the IOMMU.
981986
* @nents: The number of entries in the scatter/gather list.
982987
* @direction: The direction of the DMA transaction (to/from device).
988+
* @attrs: attributes
983989
*
984990
* This function implements the pci_unmap_sg function.
985991
*/

0 commit comments

Comments
 (0)