Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d33eebe authored by Jeremy Kerr's avatar Jeremy Kerr Committed by Paul Mackerras
Browse files

[POWERPC] Simplify dma_ops bug conditions 



Use BUG_ON rather than BUG to simplify the dma_ops handing,
and remove the now-unnecessary return cases.

Booted on pseries.

Signed-off-by: default avatarJeremy Kerr <jk@ozlabs.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 931b261f

arch/powerpc/kernel/dma_64.c

+28 −37
Original line number Diff line number Diff line
@@ -35,10 +35,9 @@ int dma_supported(struct device *dev, u64 mask) 
{

	struct dma_mapping_ops *dma_ops = get_dma_ops(dev);



	if (dma_ops)

	BUG_ON(!dma_ops);



	return dma_ops->dma_supported(dev, mask);

	BUG();

	return 0;

}

EXPORT_SYMBOL(dma_supported);
@@ -66,10 +65,9 @@ void *dma_alloc_coherent(struct device *dev, size_t size, 
{

	struct dma_mapping_ops *dma_ops = get_dma_ops(dev);



	if (dma_ops)

	BUG_ON(!dma_ops);



	return dma_ops->alloc_coherent(dev, size, dma_handle, flag);

	BUG();

	return NULL;

}

EXPORT_SYMBOL(dma_alloc_coherent);
@@ -78,10 +76,9 @@ void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, 
{

	struct dma_mapping_ops *dma_ops = get_dma_ops(dev);



	if (dma_ops)

	BUG_ON(!dma_ops);



	dma_ops->free_coherent(dev, size, cpu_addr, dma_handle);

	else

		BUG();

}

EXPORT_SYMBOL(dma_free_coherent);
@@ -90,10 +87,9 @@ dma_addr_t dma_map_single(struct device *dev, void *cpu_addr, size_t size, 
{

	struct dma_mapping_ops *dma_ops = get_dma_ops(dev);



	if (dma_ops)

	BUG_ON(!dma_ops);



	return dma_ops->map_single(dev, cpu_addr, size, direction);

	BUG();

	return (dma_addr_t)0;

}

EXPORT_SYMBOL(dma_map_single);
@@ -102,10 +98,9 @@ void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size, 
{

	struct dma_mapping_ops *dma_ops = get_dma_ops(dev);



	if (dma_ops)

	BUG_ON(!dma_ops);



	dma_ops->unmap_single(dev, dma_addr, size, direction);

	else

		BUG();

}

EXPORT_SYMBOL(dma_unmap_single);
@@ -115,11 +110,10 @@ dma_addr_t dma_map_page(struct device *dev, struct page *page, 
{

	struct dma_mapping_ops *dma_ops = get_dma_ops(dev);



	if (dma_ops)

		return dma_ops->map_single(dev,

				(page_address(page) + offset), size, direction);

	BUG();

	return (dma_addr_t)0;

	BUG_ON(!dma_ops);



	return dma_ops->map_single(dev, page_address(page) + offset, size,

			direction);

}

EXPORT_SYMBOL(dma_map_page);
@@ -128,10 +122,9 @@ void dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size, 
{

	struct dma_mapping_ops *dma_ops = get_dma_ops(dev);



	if (dma_ops)

	BUG_ON(!dma_ops);



	dma_ops->unmap_single(dev, dma_address, size, direction);

	else

		BUG();

}

EXPORT_SYMBOL(dma_unmap_page);
@@ -140,10 +133,9 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, 
{

	struct dma_mapping_ops *dma_ops = get_dma_ops(dev);



	if (dma_ops)

	BUG_ON(!dma_ops);



	return dma_ops->map_sg(dev, sg, nents, direction);

	BUG();

	return 0;

}

EXPORT_SYMBOL(dma_map_sg);
@@ -152,9 +144,8 @@ void dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries, 
{

	struct dma_mapping_ops *dma_ops = get_dma_ops(dev);



	if (dma_ops)

	BUG_ON(!dma_ops);



	dma_ops->unmap_sg(dev, sg, nhwentries, direction);

	else

		BUG();

}

EXPORT_SYMBOL(dma_unmap_sg);