Unify the dozen pci-dma copies we had.

2 files changed, 2 insertions, 50 deletions

diff --git a/arch/mips/galileo-boards/ev96100/Makefile b/arch/mips/galileo-boards/ev96100/Makefile
index 90034f016..8759aa161 100644
--- a/arch/mips/galileo-boards/ev96100/Makefile
+++ b/arch/mips/galileo-boards/ev96100/Makefile
@@ -19,7 +19,8 @@ all: ev96100.o
 
 O_TARGET:= ev96100.o
 
-O_OBJS:= prom.o time.o rtc.o irq.o int-handler.o setup.o puts.o uart.o pci-dma.o memory.o
+O_OBJS:= prom.o time.o rtc.o irq.o int-handler.o setup.o puts.o uart.o \
+	 memory.o
 
 dep:
 	$(CPP) -M *.c > .depend
diff --git a/arch/mips/galileo-boards/ev96100/pci-dma.c b/arch/mips/galileo-boards/ev96100/pci-dma.c
deleted file mode 100644
index b338b286a..000000000
--- a/arch/mips/galileo-boards/ev96100/pci-dma.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2000   Ani Joshi <ajoshi@unixbox.com>
- *
- *
- * Dynamic DMA mapping support.
- *
- * swiped from i386, and cloned for MIPS by Geert.
- *
- */
-
-#include <linux/types.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/pci.h>
-#include <asm/io.h>
-
-/*
- * [jsun] We want to return non-cached area so that data can be consistent
- * Apparently on x86, this is not an issue because cache is automatically
- * invalidated.
- *
- * To make we are doing the right thing, I add some extra debug macros.
- */
-
-void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size,
-			   dma_addr_t *dma_handle)
-{
-	void *ret;
-	int gfp = GFP_ATOMIC;
-
-	if (hwdev == NULL || hwdev->dma_mask != 0xffffffff)
-		gfp |= GFP_DMA;
-	ret = (void *)__get_free_pages(gfp, get_order(size));
-
-	if (ret != NULL) {
-		dma_cache_inv((unsigned long)ret, size);
-		*dma_handle = virt_to_bus(ret);
-	}
-        ret = (void*) ((unsigned long)ret | 0xA0000000);
-
-	return ret;
-}
-
-void pci_free_consistent(struct pci_dev *hwdev, size_t size,
-			 void *vaddr, dma_addr_t dma_handle)
-{
-        vaddr = (void*) ((unsigned long)vaddr & ~0xA0000000);
-	free_pages((unsigned long)vaddr, get_order(size));
-}