[media] omap3isp: stat: Rename IS_COHERENT_BUF to ISP_STAT_USES_DMAENGINE
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Thu, 2 Jan 2014 12:47:32 +0000 (09:47 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Sun, 25 May 2014 14:05:38 +0000 (11:05 -0300)
The macro is meant to test whether the statistics engine uses an
external DMA engine to transfer data or supports DMA directly. As both
cases will be supported by DMA coherent buffers rename the macro to
ISP_STAT_USES_DMAENGINE for improved clarity.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/platform/omap3isp/ispstat.c

index 5707f85c4cc4cba883e6107e892ba864fe8bc4f5..48b702a568e34f46ebfbd5d8b599c75eda3dd39e 100644 (file)
@@ -32,7 +32,7 @@
 
 #include "isp.h"
 
-#define IS_COHERENT_BUF(stat)  ((stat)->dma_ch >= 0)
+#define ISP_STAT_USES_DMAENGINE(stat)  ((stat)->dma_ch >= 0)
 
 /*
  * MAGIC_SIZE must always be the greatest common divisor of
@@ -99,7 +99,7 @@ static void isp_stat_buf_sync_magic_for_device(struct ispstat *stat,
                                               u32 buf_size,
                                               enum dma_data_direction dir)
 {
-       if (IS_COHERENT_BUF(stat))
+       if (ISP_STAT_USES_DMAENGINE(stat))
                return;
 
        __isp_stat_buf_sync_magic(stat, buf, buf_size, dir,
@@ -111,7 +111,7 @@ static void isp_stat_buf_sync_magic_for_cpu(struct ispstat *stat,
                                            u32 buf_size,
                                            enum dma_data_direction dir)
 {
-       if (IS_COHERENT_BUF(stat))
+       if (ISP_STAT_USES_DMAENGINE(stat))
                return;
 
        __isp_stat_buf_sync_magic(stat, buf, buf_size, dir,
@@ -180,7 +180,7 @@ static void isp_stat_buf_insert_magic(struct ispstat *stat,
 static void isp_stat_buf_sync_for_device(struct ispstat *stat,
                                         struct ispstat_buffer *buf)
 {
-       if (IS_COHERENT_BUF(stat))
+       if (ISP_STAT_USES_DMAENGINE(stat))
                return;
 
        dma_sync_sg_for_device(stat->isp->dev, buf->iovm->sgt->sgl,
@@ -190,7 +190,7 @@ static void isp_stat_buf_sync_for_device(struct ispstat *stat,
 static void isp_stat_buf_sync_for_cpu(struct ispstat *stat,
                                      struct ispstat_buffer *buf)
 {
-       if (IS_COHERENT_BUF(stat))
+       if (ISP_STAT_USES_DMAENGINE(stat))
                return;
 
        dma_sync_sg_for_cpu(stat->isp->dev, buf->iovm->sgt->sgl,
@@ -360,7 +360,7 @@ static void isp_stat_bufs_free(struct ispstat *stat)
        for (i = 0; i < STAT_MAX_BUFS; i++) {
                struct ispstat_buffer *buf = &stat->buf[i];
 
-               if (!IS_COHERENT_BUF(stat)) {
+               if (!ISP_STAT_USES_DMAENGINE(stat)) {
                        if (IS_ERR_OR_NULL((void *)buf->iommu_addr))
                                continue;
                        if (buf->iovm)
@@ -489,7 +489,7 @@ static int isp_stat_bufs_alloc(struct ispstat *stat, u32 size)
 
        isp_stat_bufs_free(stat);
 
-       if (IS_COHERENT_BUF(stat))
+       if (ISP_STAT_USES_DMAENGINE(stat))
                return isp_stat_bufs_alloc_dma(stat, size);
        else
                return isp_stat_bufs_alloc_iommu(stat, size);