diff options
| author | Stoyan Gaydarov <stoyboyker@gmail.com> | 2009-06-11 08:05:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 12:01:26 -0400 |
| commit | db5c444eeb781788a0db36a2682b2417cf71f764 (patch) | |
| tree | 4b3399696f7915eeb7ab9f9c125cac8c486a6bf0 /arch/frv/mb93090-mb00 | |
| parent | d2f11bf7fc630e27dfcede367399dddf40521878 (diff) | |
FRV: BUG to BUG_ON changes
Change some BUG()'s to BUG_ON()'s.
Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/frv/mb93090-mb00')
| -rw-r--r-- | arch/frv/mb93090-mb00/pci-dma-nommu.c | 6 | ||||
| -rw-r--r-- | arch/frv/mb93090-mb00/pci-dma.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/arch/frv/mb93090-mb00/pci-dma-nommu.c b/arch/frv/mb93090-mb00/pci-dma-nommu.c index 52ff9aec799d..4e1ba0b15443 100644 --- a/arch/frv/mb93090-mb00/pci-dma-nommu.c +++ b/arch/frv/mb93090-mb00/pci-dma-nommu.c | |||
| @@ -116,8 +116,7 @@ EXPORT_SYMBOL(dma_free_coherent); | |||
| 116 | dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size, | 116 | dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size, |
| 117 | enum dma_data_direction direction) | 117 | enum dma_data_direction direction) |
| 118 | { | 118 | { |
| 119 | if (direction == DMA_NONE) | 119 | BUG_ON(direction == DMA_NONE); |
| 120 | BUG(); | ||
| 121 | 120 | ||
| 122 | frv_cache_wback_inv((unsigned long) ptr, (unsigned long) ptr + size); | 121 | frv_cache_wback_inv((unsigned long) ptr, (unsigned long) ptr + size); |
| 123 | 122 | ||
| @@ -151,8 +150,7 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, | |||
| 151 | frv_cache_wback_inv(sg_dma_address(&sg[i]), | 150 | frv_cache_wback_inv(sg_dma_address(&sg[i]), |
| 152 | sg_dma_address(&sg[i]) + sg_dma_len(&sg[i])); | 151 | sg_dma_address(&sg[i]) + sg_dma_len(&sg[i])); |
| 153 | 152 | ||
| 154 | if (direction == DMA_NONE) | 153 | BUG_ON(direction == DMA_NONE); |
| 155 | BUG(); | ||
| 156 | 154 | ||
| 157 | return nents; | 155 | return nents; |
| 158 | } | 156 | } |
diff --git a/arch/frv/mb93090-mb00/pci-dma.c b/arch/frv/mb93090-mb00/pci-dma.c index 3ddedebc4eb3..45954f0813dc 100644 --- a/arch/frv/mb93090-mb00/pci-dma.c +++ b/arch/frv/mb93090-mb00/pci-dma.c | |||
| @@ -48,8 +48,7 @@ EXPORT_SYMBOL(dma_free_coherent); | |||
| 48 | dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size, | 48 | dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size, |
| 49 | enum dma_data_direction direction) | 49 | enum dma_data_direction direction) |
| 50 | { | 50 | { |
| 51 | if (direction == DMA_NONE) | 51 | BUG_ON(direction == DMA_NONE); |
| 52 | BUG(); | ||
| 53 | 52 | ||
| 54 | frv_cache_wback_inv((unsigned long) ptr, (unsigned long) ptr + size); | 53 | frv_cache_wback_inv((unsigned long) ptr, (unsigned long) ptr + size); |
| 55 | 54 | ||
| @@ -81,8 +80,7 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, | |||
| 81 | void *vaddr; | 80 | void *vaddr; |
| 82 | int i; | 81 | int i; |
| 83 | 82 | ||
| 84 | if (direction == DMA_NONE) | 83 | BUG_ON(direction == DMA_NONE); |
| 85 | BUG(); | ||
| 86 | 84 | ||
| 87 | dampr2 = __get_DAMPR(2); | 85 | dampr2 = __get_DAMPR(2); |
| 88 | 86 | ||