]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
dma-buf: Correct dummy function declarations.
authorSumit Semwal <sumit.semwal@ti.com>
Fri, 23 Mar 2012 15:01:39 +0000 (20:31 +0530)
committerSumit Semwal <sumit.semwal@ti.com>
Fri, 23 Mar 2012 15:51:00 +0000 (21:21 +0530)
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>
include/linux/dma-buf.h

index ee7ef9990d9a1b665c68725dae552d450ff7bc6d..50a0c7ac8170b5219212e9edcf87d43ad6df16f7 100644 (file)
@@ -188,7 +188,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;
 }
@@ -215,36 +215,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 */