Commit 8829428c authored by Helge Deller's avatar Helge Deller

parisc: ccio-dma: Fix kdoc and compiler warnings

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent f28a9877
...@@ -97,7 +97,6 @@ ...@@ -97,7 +97,6 @@
#define DBG_RUN_SG(x...) #define DBG_RUN_SG(x...)
#endif #endif
#define CCIO_INLINE inline
#define WRITE_U32(value, addr) __raw_writel(value, addr) #define WRITE_U32(value, addr) __raw_writel(value, addr)
#define READ_U32(addr) __raw_readl(addr) #define READ_U32(addr) __raw_readl(addr)
...@@ -330,7 +329,8 @@ static int ioc_count; ...@@ -330,7 +329,8 @@ static int ioc_count;
/** /**
* ccio_alloc_range - Allocate pages in the ioc's resource map. * ccio_alloc_range - Allocate pages in the ioc's resource map.
* @ioc: The I/O Controller. * @ioc: The I/O Controller.
* @pages_needed: The requested number of pages to be mapped into the * @dev: The PCI device.
* @size: The requested number of bytes to be mapped into the
* I/O Pdir... * I/O Pdir...
* *
* This function searches the resource map of the ioc to locate a range * This function searches the resource map of the ioc to locate a range
...@@ -552,7 +552,7 @@ static u32 hint_lookup[] = { ...@@ -552,7 +552,7 @@ static u32 hint_lookup[] = {
* (Load Coherence Index) instruction. The 8 bits used for the virtual * (Load Coherence Index) instruction. The 8 bits used for the virtual
* index are bits 12:19 of the value returned by LCI. * index are bits 12:19 of the value returned by LCI.
*/ */
static void CCIO_INLINE static void
ccio_io_pdir_entry(u64 *pdir_ptr, space_t sid, unsigned long vba, ccio_io_pdir_entry(u64 *pdir_ptr, space_t sid, unsigned long vba,
unsigned long hints) unsigned long hints)
{ {
...@@ -623,7 +623,7 @@ ccio_io_pdir_entry(u64 *pdir_ptr, space_t sid, unsigned long vba, ...@@ -623,7 +623,7 @@ ccio_io_pdir_entry(u64 *pdir_ptr, space_t sid, unsigned long vba,
* *
* FIXME: Can we change the byte_cnt to pages_mapped? * FIXME: Can we change the byte_cnt to pages_mapped?
*/ */
static CCIO_INLINE void static void
ccio_clear_io_tlb(struct ioc *ioc, dma_addr_t iovp, size_t byte_cnt) ccio_clear_io_tlb(struct ioc *ioc, dma_addr_t iovp, size_t byte_cnt)
{ {
u32 chain_size = 1 << ioc->chainid_shift; 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) ...@@ -656,7 +656,7 @@ ccio_clear_io_tlb(struct ioc *ioc, dma_addr_t iovp, size_t byte_cnt)
* *
* FIXME: Can we change byte_cnt to pages_mapped? * FIXME: Can we change byte_cnt to pages_mapped?
*/ */
static CCIO_INLINE void static void
ccio_mark_invalid(struct ioc *ioc, dma_addr_t iova, size_t byte_cnt) ccio_mark_invalid(struct ioc *ioc, dma_addr_t iova, size_t byte_cnt)
{ {
u32 iovp = (u32)CCIO_IOVP(iova); u32 iovp = (u32)CCIO_IOVP(iova);
...@@ -795,9 +795,10 @@ ccio_map_page(struct device *dev, struct page *page, unsigned long offset, ...@@ -795,9 +795,10 @@ ccio_map_page(struct device *dev, struct page *page, unsigned long offset,
/** /**
* ccio_unmap_page - Unmap an address range from the IOMMU. * ccio_unmap_page - Unmap an address range from the IOMMU.
* @dev: The PCI device. * @dev: The PCI device.
* @addr: The start address of the DMA region. * @iova: The start address of the DMA region.
* @size: The length of the DMA region. * @size: The length of the DMA region.
* @direction: The direction of the DMA transaction (to/from device). * @direction: The direction of the DMA transaction (to/from device).
* @attrs: attributes
*/ */
static void static void
ccio_unmap_page(struct device *dev, dma_addr_t iova, size_t size, 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, ...@@ -838,6 +839,8 @@ ccio_unmap_page(struct device *dev, dma_addr_t iova, size_t size,
* @dev: The PCI device. * @dev: The PCI device.
* @size: The length of the DMA region. * @size: The length of the DMA region.
* @dma_handle: The DMA address handed back to the device (not the cpu). * @dma_handle: The DMA address handed back to the device (not the cpu).
* @flag: allocation flags
* @attrs: attributes
* *
* This function implements the pci_alloc_consistent function. * This function implements the pci_alloc_consistent function.
*/ */
...@@ -872,6 +875,7 @@ ccio_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag, ...@@ -872,6 +875,7 @@ ccio_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag,
* @size: The length of the DMA region. * @size: The length of the DMA region.
* @cpu_addr: The cpu address returned from the ccio_alloc_consistent. * @cpu_addr: The cpu address returned from the ccio_alloc_consistent.
* @dma_handle: The device address returned from the ccio_alloc_consistent. * @dma_handle: The device address returned from the ccio_alloc_consistent.
* @attrs: attributes
* *
* This function implements the pci_free_consistent function. * This function implements the pci_free_consistent function.
*/ */
...@@ -901,6 +905,7 @@ ccio_free(struct device *dev, size_t size, void *cpu_addr, ...@@ -901,6 +905,7 @@ ccio_free(struct device *dev, size_t size, void *cpu_addr,
* @sglist: The scatter/gather list to be mapped in the IOMMU. * @sglist: The scatter/gather list to be mapped in the IOMMU.
* @nents: The number of entries in the scatter/gather list. * @nents: The number of entries in the scatter/gather list.
* @direction: The direction of the DMA transaction (to/from device). * @direction: The direction of the DMA transaction (to/from device).
* @attrs: attributes
* *
* This function implements the pci_map_sg function. * This function implements the pci_map_sg function.
*/ */
...@@ -980,6 +985,7 @@ ccio_map_sg(struct device *dev, struct scatterlist *sglist, int nents, ...@@ -980,6 +985,7 @@ ccio_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
* @sglist: The scatter/gather list to be unmapped from the IOMMU. * @sglist: The scatter/gather list to be unmapped from the IOMMU.
* @nents: The number of entries in the scatter/gather list. * @nents: The number of entries in the scatter/gather list.
* @direction: The direction of the DMA transaction (to/from device). * @direction: The direction of the DMA transaction (to/from device).
* @attrs: attributes
* *
* This function implements the pci_unmap_sg function. * This function implements the pci_unmap_sg function.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment