diff options
| author | Rolf Eike Beer <eike-kernel@sf-tec.de> | 2006-09-26 02:32:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-26 11:48:55 -0400 |
| commit | 3a750363e6075a28e5542ce93a69c620c0cfd605 (patch) | |
| tree | 4585aa2dbd2a8419ff2d52d5c0148cbb10502b42 /include | |
| parent | 99325326a57b6a56595bb097655bee9fd27d77b0 (diff) | |
[PATCH] Use BUG_ON(foo) instead of "if (foo) BUG()" in include/asm-i386/dma-mapping.h
Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/dma-mapping.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/asm-i386/dma-mapping.h b/include/asm-i386/dma-mapping.h index 9cf20cacf76e..576ae01d71c8 100644 --- a/include/asm-i386/dma-mapping.h +++ b/include/asm-i386/dma-mapping.h | |||
| @@ -21,8 +21,7 @@ static inline dma_addr_t | |||
| 21 | dma_map_single(struct device *dev, void *ptr, size_t size, | 21 | dma_map_single(struct device *dev, void *ptr, size_t size, |
| 22 | enum dma_data_direction direction) | 22 | enum dma_data_direction direction) |
| 23 | { | 23 | { |
| 24 | if (direction == DMA_NONE) | 24 | BUG_ON(direction == DMA_NONE); |
| 25 | BUG(); | ||
| 26 | WARN_ON(size == 0); | 25 | WARN_ON(size == 0); |
| 27 | flush_write_buffers(); | 26 | flush_write_buffers(); |
| 28 | return virt_to_phys(ptr); | 27 | return virt_to_phys(ptr); |
| @@ -32,8 +31,7 @@ static inline void | |||
| 32 | dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size, | 31 | dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size, |
| 33 | enum dma_data_direction direction) | 32 | enum dma_data_direction direction) |
| 34 | { | 33 | { |
| 35 | if (direction == DMA_NONE) | 34 | BUG_ON(direction == DMA_NONE); |
| 36 | BUG(); | ||
| 37 | } | 35 | } |
| 38 | 36 | ||
| 39 | static inline int | 37 | static inline int |
| @@ -42,8 +40,7 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, | |||
| 42 | { | 40 | { |
| 43 | int i; | 41 | int i; |
| 44 | 42 | ||
| 45 | if (direction == DMA_NONE) | 43 | BUG_ON(direction == DMA_NONE); |
| 46 | BUG(); | ||
| 47 | WARN_ON(nents == 0 || sg[0].length == 0); | 44 | WARN_ON(nents == 0 || sg[0].length == 0); |
| 48 | 45 | ||
| 49 | for (i = 0; i < nents; i++ ) { | 46 | for (i = 0; i < nents; i++ ) { |