From: Stoyan Gaydarov <stoyboyker@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Stoyan Gaydarov <stoyboyker@gmail.com>,
rth@twiddle.net, ink@jurassic.park.msu.ru
Subject: [PATCH 11/25] [alpha] BUG to BUG_ON changes
Date: Tue, 10 Mar 2009 00:10:36 -0500 [thread overview]
Message-ID: <1236661850-8237-12-git-send-email-stoyboyker@gmail.com> (raw)
In-Reply-To: <1236661850-8237-11-git-send-email-stoyboyker@gmail.com>
Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
---
arch/alpha/kernel/pci_iommu.c | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c
index b9094da..9ebaca2 100644
--- a/arch/alpha/kernel/pci_iommu.c
+++ b/arch/alpha/kernel/pci_iommu.c
@@ -310,8 +310,7 @@ pci_map_single(struct pci_dev *pdev, void *cpu_addr, size_t size, int dir)
{
int dac_allowed;
- if (dir == PCI_DMA_NONE)
- BUG();
+ BUG_ON(dir == PCI_DMA_NONE);
dac_allowed = pdev ? pci_dac_dma_supported(pdev, pdev->dma_mask) : 0;
return pci_map_single_1(pdev, cpu_addr, size, dac_allowed);
@@ -324,8 +323,7 @@ pci_map_page(struct pci_dev *pdev, struct page *page, unsigned long offset,
{
int dac_allowed;
- if (dir == PCI_DMA_NONE)
- BUG();
+ BUG_ON(dir == PCI_DMA_NONE);
dac_allowed = pdev ? pci_dac_dma_supported(pdev, pdev->dma_mask) : 0;
return pci_map_single_1(pdev, (char *)page_address(page) + offset,
@@ -348,8 +346,7 @@ pci_unmap_single(struct pci_dev *pdev, dma_addr_t dma_addr, size_t size,
struct pci_iommu_arena *arena;
long dma_ofs, npages;
- if (direction == PCI_DMA_NONE)
- BUG();
+ BUG_ON(direction == PCI_DMA_NONE);
if (dma_addr >= __direct_map_base
&& dma_addr < __direct_map_base + __direct_map_size) {
@@ -641,8 +638,7 @@ pci_map_sg(struct pci_dev *pdev, struct scatterlist *sg, int nents,
int dac_allowed;
struct device *dev;
- if (direction == PCI_DMA_NONE)
- BUG();
+ BUG_ON(direction == PCI_DMA_NONE);
dac_allowed = pdev ? pci_dac_dma_supported(pdev, pdev->dma_mask) : 0;
@@ -723,8 +719,7 @@ pci_unmap_sg(struct pci_dev *pdev, struct scatterlist *sg, int nents,
dma_addr_t max_dma;
dma_addr_t fbeg, fend;
- if (direction == PCI_DMA_NONE)
- BUG();
+ BUG_ON(direction == PCI_DMA_NONE);
if (! alpha_mv.mv_pci_tbi)
return;
--
1.6.1.3
next prev parent reply other threads:[~2009-03-10 5:15 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-10 5:10 [PATCH 00/25] BUG to BUG_ON changes Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 01/25] [btrfs] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 02/25] [staging] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 03/25] [net] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 04/25] [arm] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 05/25] [ia64] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 06/25] [mips] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 07/25] [x86] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 08/25] [sparc] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 09/25] [s390] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 10/25] [mn10300] " Stoyan Gaydarov
2009-03-10 5:10 ` Stoyan Gaydarov [this message]
2009-03-10 5:10 ` [PATCH 12/25] [frv] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 13/25] [blackfin] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 14/25] [mm] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 15/25] [cris] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 16/25] [m32r] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 17/25] [parisc] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 18/25] [xtensa] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 19/25] [sysctl.c] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 20/25] [scsi] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 21/25] [afs] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 22/25] [reiserfs] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 23/25] [drivers/misc] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 24/25] [crypto] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 25/25] [drivers] " Stoyan Gaydarov
2009-03-11 11:54 ` [PATCH 21/25] [afs] " David Howells
2009-03-13 4:51 ` [PATCH 17/25] [parisc] " Kyle McMartin
2009-03-10 7:49 ` [PATCH 16/25] [m32r] " Hirokazu Takata
2009-04-02 11:57 ` [PATCH 15/25] [cris] " Jesper Nilsson
2009-03-11 11:48 ` [PATCH 12/25] [frv] " David Howells
2009-03-11 11:36 ` [PATCH 10/25] [mn10300] " David Howells
2009-03-10 11:17 ` [PATCH 09/25] [s390] " Christian Borntraeger
2009-03-10 5:16 ` [PATCH 08/25] [sparc] " David Miller
2009-03-10 8:37 ` [PATCH 07/25] [x86] " Ingo Molnar
2009-03-10 8:57 ` [tip:x86/debug] x86: " Stoyan Gaydarov
2009-03-11 19:18 ` [PATCH 06/25] [mips] " Ralf Baechle
2009-03-10 5:16 ` [PATCH 03/25] [net] " David Miller
2009-03-10 10:23 ` Alexey Dobriyan
2009-03-10 11:24 ` David Miller
2009-03-10 19:54 ` Brandeburg, Jesse
2009-03-10 10:22 ` [PATCH 02/25] [staging] " Alexey Dobriyan
2009-03-10 9:16 ` [PATCH 01/25] [btrfs] " David John
2009-03-10 18:16 ` Stoyan Gaydarov
2009-03-10 18:20 ` Oliver Mattos
2009-03-10 13:24 ` Chris Mason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1236661850-8237-12-git-send-email-stoyboyker@gmail.com \
--to=stoyboyker@gmail.com \
--cc=ink@jurassic.park.msu.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox