MIPS: consolidate the swiotlb implementations

[sfrench/cifs-2.6.git] / arch / mips / cavium-octeon / dma-octeon.c

diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
index 7f0c9f926b6eb510d2ae37dd2380481aa312a063..236833be6fbe6d2a64c2e2a6386385c81db05bd3 100644 (file)
--- a/arch/mips/cavium-octeon/dma-octeon.c
+++ b/arch/mips/cavium-octeon/dma-octeon.c
@@ -11,7 +11,6 @@
  * Copyright (C) 2010 Cavium Networks, Inc.
  */
 #include <linux/dma-direct.h>
-#include <linux/scatterlist.h>
 #include <linux/bootmem.h>
 #include <linux/swiotlb.h>
 #include <linux/types.h>
@@ -169,49 +168,6 @@ void __init octeon_pci_dma_init(void)
 }
 #endif /* CONFIG_PCI */
 
-static dma_addr_t octeon_dma_map_page(struct device *dev, struct page *page,
-       unsigned long offset, size_t size, enum dma_data_direction direction,
-       unsigned long attrs)
-{
-       dma_addr_t daddr = swiotlb_map_page(dev, page, offset, size,
-                                           direction, attrs);
-       mb();
-
-       return daddr;
-}
-
-static int octeon_dma_map_sg(struct device *dev, struct scatterlist *sg,
-       int nents, enum dma_data_direction direction, unsigned long attrs)
-{
-       int r = swiotlb_map_sg_attrs(dev, sg, nents, direction, attrs);
-       mb();
-       return r;
-}
-
-static void octeon_dma_sync_single_for_device(struct device *dev,
-       dma_addr_t dma_handle, size_t size, enum dma_data_direction direction)
-{
-       swiotlb_sync_single_for_device(dev, dma_handle, size, direction);
-       mb();
-}
-
-static void octeon_dma_sync_sg_for_device(struct device *dev,
-       struct scatterlist *sg, int nelems, enum dma_data_direction direction)
-{
-       swiotlb_sync_sg_for_device(dev, sg, nelems, direction);
-       mb();
-}
-
-static void *octeon_dma_alloc_coherent(struct device *dev, size_t size,
-       dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs)
-{
-       void *ret = swiotlb_alloc(dev, size, dma_handle, gfp, attrs);
-
-       mb();
-
-       return ret;
-}
-
 dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr)
 {
 #ifdef CONFIG_PCI
@@ -230,21 +186,6 @@ phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t daddr)
        return daddr;
 }
 
-static const struct dma_map_ops octeon_swiotlb_ops = {
-       .alloc                  = octeon_dma_alloc_coherent,
-       .free                   = swiotlb_free,
-       .map_page               = octeon_dma_map_page,
-       .unmap_page             = swiotlb_unmap_page,
-       .map_sg                 = octeon_dma_map_sg,
-       .unmap_sg               = swiotlb_unmap_sg_attrs,
-       .sync_single_for_cpu    = swiotlb_sync_single_for_cpu,
-       .sync_single_for_device = octeon_dma_sync_single_for_device,
-       .sync_sg_for_cpu        = swiotlb_sync_sg_for_cpu,
-       .sync_sg_for_device     = octeon_dma_sync_sg_for_device,
-       .mapping_error          = swiotlb_dma_mapping_error,
-       .dma_supported          = swiotlb_dma_supported
-};
-
 char *octeon_swiotlb;
 
 void __init plat_swiotlb_setup(void)
@@ -307,6 +248,4 @@ void __init plat_swiotlb_setup(void)
 
        if (swiotlb_init_with_tbl(octeon_swiotlb, swiotlb_nslabs, 1) == -ENOMEM)
                panic("Cannot allocate SWIOTLB buffer");
-
-       mips_dma_map_ops = &octeon_swiotlb_ops;
 }