forked from luck/tmp_suning_uos_patched
[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>
This commit is contained in:
parent
99325326a5
commit
3a750363e6
@ -21,8 +21,7 @@ static inline dma_addr_t
|
|||||||
dma_map_single(struct device *dev, void *ptr, size_t size,
|
dma_map_single(struct device *dev, void *ptr, size_t size,
|
||||||
enum dma_data_direction direction)
|
enum dma_data_direction direction)
|
||||||
{
|
{
|
||||||
if (direction == DMA_NONE)
|
BUG_ON(direction == DMA_NONE);
|
||||||
BUG();
|
|
||||||
WARN_ON(size == 0);
|
WARN_ON(size == 0);
|
||||||
flush_write_buffers();
|
flush_write_buffers();
|
||||||
return virt_to_phys(ptr);
|
return virt_to_phys(ptr);
|
||||||
@ -32,8 +31,7 @@ static inline void
|
|||||||
dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
|
dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
|
||||||
enum dma_data_direction direction)
|
enum dma_data_direction direction)
|
||||||
{
|
{
|
||||||
if (direction == DMA_NONE)
|
BUG_ON(direction == DMA_NONE);
|
||||||
BUG();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int
|
static inline int
|
||||||
@ -42,8 +40,7 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
|
|||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (direction == DMA_NONE)
|
BUG_ON(direction == DMA_NONE);
|
||||||
BUG();
|
|
||||||
WARN_ON(nents == 0 || sg[0].length == 0);
|
WARN_ON(nents == 0 || sg[0].length == 0);
|
||||||
|
|
||||||
for (i = 0; i < nents; i++ ) {
|
for (i = 0; i < nents; i++ ) {
|
||||||
|
Loading…
Reference in New Issue
Block a user