dma-mapping: remove dma_{alloc,free,mmap}_writecombine

We can already use DMA_ATTR_WRITE_COMBINE or the _wc prefixed version,
so remove the third way of doing things.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c
index 785c5546067a69bfa3c4449809ea67325dca8674..ed0ccbeed70f2a6292b902c50fac84bbbd68c612 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dispc.c
+++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
@@ -4609,11 +4609,10 @@ static int dispc_errata_i734_wa_init(struct dispc_device *dispc)
        i734_buf.size = i734.ovli.width * i734.ovli.height *
                color_mode_to_bpp(i734.ovli.fourcc) / 8;
 
-       i734_buf.vaddr = dma_alloc_writecombine(&dispc->pdev->dev,
-                                               i734_buf.size, &i734_buf.paddr,
-                                               GFP_KERNEL);
+       i734_buf.vaddr = dma_alloc_wc(&dispc->pdev->dev, i734_buf.size,
+                                     &i734_buf.paddr, GFP_KERNEL);
        if (!i734_buf.vaddr) {
-               dev_err(&dispc->pdev->dev, "%s: dma_alloc_writecombine failed\n",
+               dev_err(&dispc->pdev->dev, "%s: dma_alloc_wc failed\n",
                        __func__);
                return -ENOMEM;
        }
@@ -4626,8 +4625,8 @@ static void dispc_errata_i734_wa_fini(struct dispc_device *dispc)
        if (!dispc->feat->has_gamma_i734_bug)
                return;
 
-       dma_free_writecombine(&dispc->pdev->dev, i734_buf.size, i734_buf.vaddr,
-                             i734_buf.paddr);
+       dma_free_wc(&dispc->pdev->dev, i734_buf.size, i734_buf.vaddr,
+                   i734_buf.paddr);
 }
 
 static void dispc_errata_i734_wa(struct dispc_device *dispc)

diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index 10dc9ac3cccb10c82e45842c00dfdcd83103e390..41d4e91b0982ce94292d81078cb4bf35cf9365fc 100644 (file)
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -796,9 +796,6 @@ static inline void *dma_alloc_wc(struct device *dev, size_t size,
 
        return dma_alloc_attrs(dev, size, dma_addr, gfp, attrs);
 }
-#ifndef dma_alloc_writecombine
-#define dma_alloc_writecombine dma_alloc_wc
-#endif
 
 static inline void dma_free_wc(struct device *dev, size_t size,
                               void *cpu_addr, dma_addr_t dma_addr)
@@ -806,9 +803,6 @@ static inline void dma_free_wc(struct device *dev, size_t size,
        return dma_free_attrs(dev, size, cpu_addr, dma_addr,
                              DMA_ATTR_WRITE_COMBINE);
 }
-#ifndef dma_free_writecombine
-#define dma_free_writecombine dma_free_wc
-#endif
 
 static inline int dma_mmap_wc(struct device *dev,
                              struct vm_area_struct *vma,
@@ -818,9 +812,6 @@ static inline int dma_mmap_wc(struct device *dev,
        return dma_mmap_attrs(dev, vma, cpu_addr, dma_addr, size,
                              DMA_ATTR_WRITE_COMBINE);
 }
-#ifndef dma_mmap_writecombine
-#define dma_mmap_writecombine dma_mmap_wc
-#endif
 
 #ifdef CONFIG_NEED_DMA_MAP_STATE
 #define DEFINE_DMA_UNMAP_ADDR(ADDR_NAME)        dma_addr_t ADDR_NAME