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

Commit 145106e8 authored by Muli Ben-Yehuda's avatar Muli Ben-Yehuda Committed by Andi Kleen
Browse files

[PATCH] remove superflous BUG_ON's in nommu and gart 



There's no need to check for invalid DMA data direction in nommu and
gart since we do it in dma-mapping.h anyway before calling the
individual dma-ops.

Signed-off-by: default avatarMuli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 29a6c25b

arch/x86_64/kernel/pci-gart.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -239,8 +239,6 @@ dma_addr_t gart_map_single(struct device *dev, void *addr, size_t size, int dir) 
{

{

	unsigned long phys_mem, bus;

	unsigned long phys_mem, bus;





	BUG_ON(dir == DMA_NONE);



	if (!dev)

	if (!dev)

		dev = &fallback_dev;

		dev = &fallback_dev;
@@ -383,7 +381,6 @@ int gart_map_sg(struct device *dev, struct scatterlist *sg, int nents, int dir) 
	unsigned long pages = 0;

	unsigned long pages = 0;

	int need = 0, nextneed;

	int need = 0, nextneed;





	BUG_ON(dir == DMA_NONE);

	if (nents == 0) 

	if (nents == 0) 

		return 0;

		return 0;

arch/x86_64/kernel/pci-nommu.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -59,7 +59,6 @@ int nommu_map_sg(struct device *hwdev, struct scatterlist *sg, 
{

{

	int i;

	int i;





	BUG_ON(direction == DMA_NONE);

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

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

		struct scatterlist *s = &sg[i];

		struct scatterlist *s = &sg[i];

		BUG_ON(!s->page);

		BUG_ON(!s->page);