vserver 1.9.5.x5

[linux-2.6.git] / include / asm-sh / dma-mapping.h

diff --git a/include/asm-sh/dma-mapping.h b/include/asm-sh/dma-mapping.h
index 8876ec7..db78317 100644 (file)
--- a/include/asm-sh/dma-mapping.h
+++ b/include/asm-sh/dma-mapping.h
@@ -3,23 +3,17 @@
 
 #include <linux/config.h>
 #include <linux/mm.h>
+#include <linux/device.h>
 #include <asm/scatterlist.h>
 #include <asm/io.h>
 
+extern struct bus_type pci_bus_type;
+
 /* arch/sh/mm/consistent.c */
 extern void *consistent_alloc(int gfp, size_t size, dma_addr_t *handle);
 extern void consistent_free(void *vaddr, size_t size);
 extern void consistent_sync(void *vaddr, size_t size, int direction);
 
-#ifdef CONFIG_SH_DREAMCAST
-struct pci_dev;
-extern struct bus_type pci_bus_type;
-extern void *__pci_alloc_consistent(struct pci_dev *hwdev, size_t size,
-                                   dma_addr_t *dma_handle);
-extern void __pci_free_consistent(struct pci_dev *hwdev, size_t size,
-                                 void *vaddr, dma_addr_t dma_handle);
-#endif
-
 #define dma_supported(dev, mask)       (1)
 
 static inline int dma_set_mask(struct device *dev, u64 mask)
@@ -35,16 +29,13 @@ static inline int dma_set_mask(struct device *dev, u64 mask)
 static inline void *dma_alloc_coherent(struct device *dev, size_t size,
                         dma_addr_t *dma_handle, int flag)
 {
-       /*
-        * Some platforms have special pci_alloc_consistent() implementations,
-        * in these instances we can't use the generic consistent_alloc().
-        */
-#ifdef CONFIG_SH_DREAMCAST
-       if (dev && dev->bus == &pci_bus_type)
-               return __pci_alloc_consistent(NULL, size, dma_handle);
-#endif
-       if (sh_mv.mv_consistent_alloc)
-               return sh_mv.mv_consistent_alloc(dev, size, dma_handle, flag);
+       if (sh_mv.mv_consistent_alloc) {
+               void *ret;
+
+               ret = sh_mv.mv_consistent_alloc(dev, size, dma_handle, flag);
+               if (ret != NULL)
+                       return ret;
+       }
 
        return consistent_alloc(flag, size, dma_handle);
 }
@@ -52,19 +43,12 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size,
 static inline void dma_free_coherent(struct device *dev, size_t size,
                       void *vaddr, dma_addr_t dma_handle)
 {
-       /*
-        * Same note as above applies to pci_free_consistent()..
-        */
-#ifdef CONFIG_SH_DREAMCAST
-       if (dev && dev->bus == &pci_bus_type) {
-               __pci_free_consistent(NULL, size, vaddr, dma_handle);
-               return;
-       }
-#endif
-
        if (sh_mv.mv_consistent_free) {
-               sh_mv.mv_consistent_free(dev, size, vaddr, dma_handle);
-               return;
+               int ret;
+
+               ret = sh_mv.mv_consistent_free(dev, size, vaddr, dma_handle);
+               if (ret == 0)
+                       return;
        }
 
        consistent_free(vaddr, size);