Skip to content

Commit

Permalink
alpha: use BUG_ON where possible
Browse files Browse the repository at this point in the history
Just use BUG_ON() instead of constructions such as:

	if (...)
		BUG()

A simplified version of the semantic patch that makes this transformation
is as follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@
expression e;
@@
- if (e) BUG();
+ BUG_ON(e);
// </smpl>

Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  • Loading branch information
Sasha Levin authored and Jiri Kosina committed Nov 8, 2012
1 parent 926ccfe commit 8166ea0
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions arch/alpha/kernel/pci_iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -354,8 +354,7 @@ static dma_addr_t alpha_pci_map_page(struct device *dev, struct page *page,
struct pci_dev *pdev = alpha_gendev_to_pci(dev);
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,
Expand All @@ -378,8 +377,7 @@ static void alpha_pci_unmap_page(struct device *dev, dma_addr_t dma_addr,
struct pci_iommu_arena *arena;
long dma_ofs, npages;

if (dir == PCI_DMA_NONE)
BUG();
BUG_ON(dir == PCI_DMA_NONE);

if (dma_addr >= __direct_map_base
&& dma_addr < __direct_map_base + __direct_map_size) {
Expand Down Expand Up @@ -662,8 +660,7 @@ static int alpha_pci_map_sg(struct device *dev, struct scatterlist *sg,
dma_addr_t max_dma;
int dac_allowed;

if (dir == PCI_DMA_NONE)
BUG();
BUG_ON(dir == PCI_DMA_NONE);

dac_allowed = dev ? pci_dac_dma_supported(pdev, pdev->dma_mask) : 0;

Expand Down Expand Up @@ -742,8 +739,7 @@ static void alpha_pci_unmap_sg(struct device *dev, struct scatterlist *sg,
dma_addr_t max_dma;
dma_addr_t fbeg, fend;

if (dir == PCI_DMA_NONE)
BUG();
BUG_ON(dir == PCI_DMA_NONE);

if (! alpha_mv.mv_pci_tbi)
return;
Expand Down

0 comments on commit 8166ea0

Please sign in to comment.