Commit 8980a7ba authored by Helge Deller's avatar Helge Deller Committed by Kyle McMartin
Browse files

parisc: BUG_ON() cleanup 



- convert a few "if (xx) BUG();" to BUG_ON(xx)
- remove a few printk()s, as we get a backtrace with BUG_ON() anyway

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarKyle McMartin <kyle@mcmartin.ca>
parent 041b6237

arch/parisc/kernel/cache.c

+1 −4
Original line number Diff line number Diff line
@@ -551,10 +551,7 @@ void flush_cache_range(struct vm_area_struct *vma, 
{

	int sr3;



	if (!vma->vm_mm->context) {

		BUG();

		return;

	}

	BUG_ON(!vma->vm_mm->context);



	sr3 = mfsp(3);

	if (vma->vm_mm->context == sr3) {

arch/parisc/kernel/pci-dma.c

+6 −16
Original line number Diff line number Diff line
@@ -447,10 +447,7 @@ static void pa11_dma_free_consistent (struct device *dev, size_t size, void *vad 


static dma_addr_t pa11_dma_map_single(struct device *dev, void *addr, size_t size, enum dma_data_direction direction)

{

	if (direction == DMA_NONE) {

		printk(KERN_ERR "pa11_dma_map_single(PCI_DMA_NONE) called by %p\n", __builtin_return_address(0));

		BUG();

	}

	BUG_ON(direction == DMA_NONE);



	flush_kernel_dcache_range((unsigned long) addr, size);

	return virt_to_phys(addr);
@@ -458,10 +455,7 @@ static dma_addr_t pa11_dma_map_single(struct device *dev, void *addr, size_t siz 


static void pa11_dma_unmap_single(struct device *dev, dma_addr_t dma_handle, size_t size, enum dma_data_direction direction)

{

	if (direction == DMA_NONE) {

		printk(KERN_ERR "pa11_dma_unmap_single(PCI_DMA_NONE) called by %p\n", __builtin_return_address(0));

		BUG();

	}

	BUG_ON(direction == DMA_NONE);



	if (direction == DMA_TO_DEVICE)

	    return;
@@ -480,8 +474,7 @@ static int pa11_dma_map_sg(struct device *dev, struct scatterlist *sglist, int n 
{

	int i;



	if (direction == DMA_NONE)

	    BUG();

	BUG_ON(direction == DMA_NONE);



	for (i = 0; i < nents; i++, sglist++ ) {

		unsigned long vaddr = sg_virt_addr(sglist);
@@ -496,8 +489,7 @@ static void pa11_dma_unmap_sg(struct device *dev, struct scatterlist *sglist, in 
{

	int i;



	if (direction == DMA_NONE)

	    BUG();

	BUG_ON(direction == DMA_NONE);



	if (direction == DMA_TO_DEVICE)

	    return;
@@ -511,16 +503,14 @@ static void pa11_dma_unmap_sg(struct device *dev, struct scatterlist *sglist, in 


static void pa11_dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, unsigned long offset, size_t size, enum dma_data_direction direction)

{

	if (direction == DMA_NONE)

	    BUG();

	BUG_ON(direction == DMA_NONE);



	flush_kernel_dcache_range((unsigned long) phys_to_virt(dma_handle) + offset, size);

}



static void pa11_dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, unsigned long offset, size_t size, enum dma_data_direction direction)

{

	if (direction == DMA_NONE)

	    BUG();

	BUG_ON(direction == DMA_NONE);



	flush_kernel_dcache_range((unsigned long) phys_to_virt(dma_handle) + offset, size);

}

arch/parisc/mm/init.c

+2 −4
Original line number Diff line number Diff line
@@ -304,10 +304,8 @@ static void __init setup_bootmem(void) 
	 */

	max_low_pfn = max_pfn;



	if ((bootmap_pfn - bootmap_start_pfn) != bootmap_pages) {

		printk(KERN_WARNING "WARNING! bootmap sizing is messed up!\n");

		BUG();

	}

	/* bootmap sizing messed up? */

	BUG_ON((bootmap_pfn - bootmap_start_pfn) != bootmap_pages);



	/* reserve PAGE0 pdc memory, kernel text/data/bss & bootmap */