[PATCH] dma-mapping.h stubs fix
do { } while(0) is not a good imitation of function returning void; use ((void)0) instead. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
d0a23398ee
commit
6a13f66043
|
@ -41,9 +41,9 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
|
|||
#define dma_map_single(dev, va, size, dir) virt_to_phys(va)
|
||||
#define dma_map_page(dev, page, off, size, dir) (page_to_pa(page) + off)
|
||||
|
||||
#define dma_unmap_single(dev, addr, size, dir) do { } while (0)
|
||||
#define dma_unmap_page(dev, addr, size, dir) do { } while (0)
|
||||
#define dma_unmap_sg(dev, sg, nents, dir) do { } while (0)
|
||||
#define dma_unmap_single(dev, addr, size, dir) ((void)0)
|
||||
#define dma_unmap_page(dev, addr, size, dir) ((void)0)
|
||||
#define dma_unmap_sg(dev, sg, nents, dir) ((void)0)
|
||||
|
||||
#define dma_mapping_error(addr) (0)
|
||||
|
||||
|
|
|
@ -37,9 +37,9 @@ extern void __dma_sync_page(struct page *page, unsigned long offset,
|
|||
*/
|
||||
|
||||
#define __dma_alloc_coherent(gfp, size, handle) NULL
|
||||
#define __dma_free_coherent(size, addr) do { } while (0)
|
||||
#define __dma_sync(addr, size, rw) do { } while (0)
|
||||
#define __dma_sync_page(pg, off, sz, rw) do { } while (0)
|
||||
#define __dma_free_coherent(size, addr) ((void)0)
|
||||
#define __dma_sync(addr, size, rw) ((void)0)
|
||||
#define __dma_sync_page(pg, off, sz, rw) ((void)0)
|
||||
|
||||
#endif /* ! CONFIG_NOT_COHERENT_CACHE */
|
||||
|
||||
|
@ -251,7 +251,7 @@ dma_map_single(struct device *dev, void *ptr, size_t size,
|
|||
}
|
||||
|
||||
/* We do nothing. */
|
||||
#define dma_unmap_single(dev, addr, size, dir) do { } while (0)
|
||||
#define dma_unmap_single(dev, addr, size, dir) ((void)0)
|
||||
|
||||
static inline dma_addr_t
|
||||
dma_map_page(struct device *dev, struct page *page,
|
||||
|
@ -266,7 +266,7 @@ dma_map_page(struct device *dev, struct page *page,
|
|||
}
|
||||
|
||||
/* We do nothing. */
|
||||
#define dma_unmap_page(dev, handle, size, dir) do { } while (0)
|
||||
#define dma_unmap_page(dev, handle, size, dir) ((void)0)
|
||||
|
||||
static inline int
|
||||
dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
|
||||
|
@ -286,7 +286,7 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
|
|||
}
|
||||
|
||||
/* We don't do anything here. */
|
||||
#define dma_unmap_sg(dev, sg, nents, dir) do { } while (0)
|
||||
#define dma_unmap_sg(dev, sg, nents, dir) ((void)0)
|
||||
|
||||
#endif /* CONFIG_PPC64 */
|
||||
|
||||
|
|
Loading…
Reference in New Issue