aboutsummaryrefslogtreecommitdiffstats
path: root/arch/frv/include/asm/pci.h
diff options
context:
space:
mode:
authorStoyan Gaydarov <stoyboyker@gmail.com>2009-06-11 08:05:04 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-11 12:01:26 -0400
commitdb5c444eeb781788a0db36a2682b2417cf71f764 (patch)
tree4b3399696f7915eeb7ab9f9c125cac8c486a6bf0 /arch/frv/include/asm/pci.h
parentd2f11bf7fc630e27dfcede367399dddf40521878 (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/include/asm/pci.h')
-rw-r--r--arch/frv/include/asm/pci.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/frv/include/asm/pci.h b/arch/frv/include/asm/pci.h
index 585d9b49949a..cc685e60b0f9 100644
--- a/arch/frv/include/asm/pci.h
+++ b/arch/frv/include/asm/pci.h
@@ -87,8 +87,7 @@ static inline void pci_dma_sync_single(struct pci_dev *hwdev,
87 dma_addr_t dma_handle, 87 dma_addr_t dma_handle,
88 size_t size, int direction) 88 size_t size, int direction)
89{ 89{
90 if (direction == PCI_DMA_NONE) 90 BUG_ON(direction == PCI_DMA_NONE);
91 BUG();
92 91
93 frv_cache_wback_inv((unsigned long)bus_to_virt(dma_handle), 92 frv_cache_wback_inv((unsigned long)bus_to_virt(dma_handle),
94 (unsigned long)bus_to_virt(dma_handle) + size); 93 (unsigned long)bus_to_virt(dma_handle) + size);
@@ -105,9 +104,7 @@ static inline void pci_dma_sync_sg(struct pci_dev *hwdev,
105 int nelems, int direction) 104 int nelems, int direction)
106{ 105{
107 int i; 106 int i;
108 107 BUG_ON(direction == PCI_DMA_NONE);
109 if (direction == PCI_DMA_NONE)
110 BUG();
111 108
112 for (i = 0; i < nelems; i++) 109 for (i = 0; i < nelems; i++)
113 frv_cache_wback_inv(sg_dma_address(&sg[i]), 110 frv_cache_wback_inv(sg_dma_address(&sg[i]),