Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[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>
authored by Al Viro and committed by Linus Torvalds 6a13f660 d0a23398
+3
-3
include/asm-alpha/dma-mapping.h
+3
-3
include/asm-alpha/dma-mapping.h
···
41
41
#define dma_map_single(dev, va, size, dir) virt_to_phys(va)
42
42
#define dma_map_page(dev, page, off, size, dir) (page_to_pa(page) + off)
43
43
44
-
#define dma_unmap_single(dev, addr, size, dir) do { } while (0)
45
-
#define dma_unmap_page(dev, addr, size, dir) do { } while (0)
46
-
#define dma_unmap_sg(dev, sg, nents, dir) do { } while (0)
44
+
#define dma_unmap_single(dev, addr, size, dir) ((void)0)
45
+
#define dma_unmap_page(dev, addr, size, dir) ((void)0)
46
+
#define dma_unmap_sg(dev, sg, nents, dir) ((void)0)
47
47
48
48
#define dma_mapping_error(addr) (0)
49
49
+6
-6
include/asm-powerpc/dma-mapping.h
+6
-6
include/asm-powerpc/dma-mapping.h
···
37
37
*/
38
38
39
39
#define __dma_alloc_coherent(gfp, size, handle) NULL
40
-
#define __dma_free_coherent(size, addr) do { } while (0)
41
-
#define __dma_sync(addr, size, rw) do { } while (0)
42
-
#define __dma_sync_page(pg, off, sz, rw) do { } while (0)
40
+
#define __dma_free_coherent(size, addr) ((void)0)
41
+
#define __dma_sync(addr, size, rw) ((void)0)
42
+
#define __dma_sync_page(pg, off, sz, rw) ((void)0)
43
43
44
44
#endif /* ! CONFIG_NOT_COHERENT_CACHE */
45
45
···
251
251
}
252
252
253
253
/* We do nothing. */
254
-
#define dma_unmap_single(dev, addr, size, dir) do { } while (0)
254
+
#define dma_unmap_single(dev, addr, size, dir) ((void)0)
255
255
256
256
static inline dma_addr_t
257
257
dma_map_page(struct device *dev, struct page *page,
···
266
266
}
267
267
268
268
/* We do nothing. */
269
-
#define dma_unmap_page(dev, handle, size, dir) do { } while (0)
269
+
#define dma_unmap_page(dev, handle, size, dir) ((void)0)
270
270
271
271
static inline int
272
272
dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
···
286
286
}
287
287
288
288
/* We don't do anything here. */
289
-
#define dma_unmap_sg(dev, sg, nents, dir) do { } while (0)
289
+
#define dma_unmap_sg(dev, sg, nents, dir) ((void)0)
290
290
291
291
#endif /* CONFIG_PPC64 */
292
292