alpha: use BUG_ON where possible
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>
This commit is contained in:
parent
926ccfef82
commit
8166ea07cb
1 changed files with 4 additions and 8 deletions
|
@ -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);
|
struct pci_dev *pdev = alpha_gendev_to_pci(dev);
|
||||||
int dac_allowed;
|
int dac_allowed;
|
||||||
|
|
||||||
if (dir == PCI_DMA_NONE)
|
BUG_ON(dir == PCI_DMA_NONE);
|
||||||
BUG();
|
|
||||||
|
|
||||||
dac_allowed = pdev ? pci_dac_dma_supported(pdev, pdev->dma_mask) : 0;
|
dac_allowed = pdev ? pci_dac_dma_supported(pdev, pdev->dma_mask) : 0;
|
||||||
return pci_map_single_1(pdev, (char *)page_address(page) + offset,
|
return pci_map_single_1(pdev, (char *)page_address(page) + offset,
|
||||||
|
@ -378,8 +377,7 @@ static void alpha_pci_unmap_page(struct device *dev, dma_addr_t dma_addr,
|
||||||
struct pci_iommu_arena *arena;
|
struct pci_iommu_arena *arena;
|
||||||
long dma_ofs, npages;
|
long dma_ofs, npages;
|
||||||
|
|
||||||
if (dir == PCI_DMA_NONE)
|
BUG_ON(dir == PCI_DMA_NONE);
|
||||||
BUG();
|
|
||||||
|
|
||||||
if (dma_addr >= __direct_map_base
|
if (dma_addr >= __direct_map_base
|
||||||
&& dma_addr < __direct_map_base + __direct_map_size) {
|
&& dma_addr < __direct_map_base + __direct_map_size) {
|
||||||
|
@ -662,8 +660,7 @@ static int alpha_pci_map_sg(struct device *dev, struct scatterlist *sg,
|
||||||
dma_addr_t max_dma;
|
dma_addr_t max_dma;
|
||||||
int dac_allowed;
|
int dac_allowed;
|
||||||
|
|
||||||
if (dir == PCI_DMA_NONE)
|
BUG_ON(dir == PCI_DMA_NONE);
|
||||||
BUG();
|
|
||||||
|
|
||||||
dac_allowed = dev ? pci_dac_dma_supported(pdev, pdev->dma_mask) : 0;
|
dac_allowed = dev ? pci_dac_dma_supported(pdev, pdev->dma_mask) : 0;
|
||||||
|
|
||||||
|
@ -742,8 +739,7 @@ static void alpha_pci_unmap_sg(struct device *dev, struct scatterlist *sg,
|
||||||
dma_addr_t max_dma;
|
dma_addr_t max_dma;
|
||||||
dma_addr_t fbeg, fend;
|
dma_addr_t fbeg, fend;
|
||||||
|
|
||||||
if (dir == PCI_DMA_NONE)
|
BUG_ON(dir == PCI_DMA_NONE);
|
||||||
BUG();
|
|
||||||
|
|
||||||
if (! alpha_mv.mv_pci_tbi)
|
if (! alpha_mv.mv_pci_tbi)
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Add table
Reference in a new issue