Skip to content

Commit

Permalink
[PATCH] remove superflous BUG_ON's in nommu and gart
Browse files Browse the repository at this point in the history
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: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Andi Kleen <ak@suse.de>
  • Loading branch information
Muli Ben-Yehuda authored and Andi Kleen committed Sep 26, 2006
1 parent 29a6c25 commit 145106e
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 4 deletions.
3 changes: 0 additions & 3 deletions arch/x86_64/kernel/pci-gart.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

BUG_ON(dir == DMA_NONE);

if (!dev)
dev = &fallback_dev;

Expand Down Expand Up @@ -383,7 +381,6 @@ int gart_map_sg(struct device *dev, struct scatterlist *sg, int nents, int dir)
unsigned long pages = 0;
int need = 0, nextneed;

BUG_ON(dir == DMA_NONE);
if (nents == 0)
return 0;

Expand Down
1 change: 0 additions & 1 deletion arch/x86_64/kernel/pci-nommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ int nommu_map_sg(struct device *hwdev, struct scatterlist *sg,
{
int i;

BUG_ON(direction == DMA_NONE);
for (i = 0; i < nents; i++ ) {
struct scatterlist *s = &sg[i];
BUG_ON(!s->page);
Expand Down

0 comments on commit 145106e

Please sign in to comment.