aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSumit Semwal <sumit.semwal@ti.com>2012-03-23 20:31:39 +0530
committerSumit Semwal <sumit.semwal@ti.com>2012-03-23 20:55:29 +0530
commit820a6b398705734f3b8d33acb6708bf10c1e26c7 (patch)
tree908dff4feda4cc6b9383c257252a7374d005b4bb
parentba9d77cd2402fb307d8f0944d4fa71e4915bb478 (diff)
dma-buf: Correct dummy function declarations.tracking-umm-3.3-wip-3.3-2012.03-2tracking-umm-3.3-wip
Dummy functions for the newly added cpu access ops are needed for compilation when dma-buf framework is not compiled-in. Also, the introduction of flags in dma_buf_fd needs to be added to dummy functions as well. Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
-rw-r--r--include/linux/dma-buf.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
index f08028ed74b8..779aaf9f4d66 100644
--- a/include/linux/dma-buf.h
+++ b/include/linux/dma-buf.h
@@ -189,7 +189,7 @@ static inline struct dma_buf *dma_buf_export(void *priv,
return ERR_PTR(-ENODEV);
}
-static inline int dma_buf_fd(struct dma_buf *dmabuf)
+static inline int dma_buf_fd(struct dma_buf *dmabuf, int flags)
{
return -ENODEV;
}
@@ -216,36 +216,36 @@ static inline void dma_buf_unmap_attachment(struct dma_buf_attachment *attach,
return;
}
-static inline int dma_buf_begin_cpu_access(struct dma_buf *,
- size_t, size_t,
- enum dma_data_direction)
+static inline int dma_buf_begin_cpu_access(struct dma_buf *dmabuf,
+ size_t start, size_t len,
+ enum dma_data_direction dir)
{
return -ENODEV;
}
-static inline void dma_buf_end_cpu_access(struct dma_buf *,
- size_t, size_t,
- enum dma_data_direction)
+static inline void dma_buf_end_cpu_access(struct dma_buf *dmabuf,
+ size_t start, size_t len,
+ enum dma_data_direction dir)
{
}
-static inline void *dma_buf_kmap_atomic(struct dma_buf *, unsigned long)
+static inline void *dma_buf_kmap_atomic(struct dma_buf *db, unsigned long pnum)
{
return NULL;
}
-static inline void dma_buf_kunmap_atomic(struct dma_buf *, unsigned long,
- void *)
+static inline void dma_buf_kunmap_atomic(struct dma_buf *db, unsigned long pnum,
+ void *vaddr)
{
}
-static inline void *dma_buf_kmap(struct dma_buf *, unsigned long)
+static inline void *dma_buf_kmap(struct dma_buf *db, unsigned long pnum)
{
return NULL;
}
-static inline void dma_buf_kunmap(struct dma_buf *, unsigned long,
- void *)
+static inline void dma_buf_kunmap(struct dma_buf *db, unsigned long pnum,
+ void *vaddr)
{
}
#endif /* CONFIG_DMA_SHARED_BUFFER */