From 94b93e975158b47d701bde19c7a6c43f26d5f1c5 Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Mon, 25 Sep 2006 23:32:20 -0700 Subject: [PATCH] --- yaml --- r: 35655 b: refs/heads/master c: 3a750363e6075a28e5542ce93a69c620c0cfd605 h: refs/heads/master i: 35653: 25573f1872a6703a5bd2277f6273c55cee381c42 35651: 7999729e1acd1f7f9dd053a987a2e570c0de83b7 35647: 2d9c780a47cae218af7edbf68023cf068166d94a v: v3 --- [refs] | 2 +- trunk/include/asm-i386/dma-mapping.h | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 15c107e4814b..3747dc5a2d10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 99325326a57b6a56595bb097655bee9fd27d77b0 +refs/heads/master: 3a750363e6075a28e5542ce93a69c620c0cfd605 diff --git a/trunk/include/asm-i386/dma-mapping.h b/trunk/include/asm-i386/dma-mapping.h index 9cf20cacf76e..576ae01d71c8 100644 --- a/trunk/include/asm-i386/dma-mapping.h +++ b/trunk/include/asm-i386/dma-mapping.h @@ -21,8 +21,7 @@ static inline dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size, enum dma_data_direction direction) { - if (direction == DMA_NONE) - BUG(); + BUG_ON(direction == DMA_NONE); WARN_ON(size == 0); flush_write_buffers(); 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, enum dma_data_direction direction) { - if (direction == DMA_NONE) - BUG(); + BUG_ON(direction == DMA_NONE); } static inline int @@ -42,8 +40,7 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, { int i; - if (direction == DMA_NONE) - BUG(); + BUG_ON(direction == DMA_NONE); WARN_ON(nents == 0 || sg[0].length == 0); for (i = 0; i < nents; i++ ) {