From: Sumit Semwal <sumit.semwal@ti.com>
To: <daniel.vetter@ffwll.ch>
Cc: <dri-devel@lists.freedesktop.org>,
<linaro-mm-sig@lists.linaro.org>, <linux-media@vger.kernel.org>,
Sumit Semwal <sumit.semwal@ti.com>,
Sumit Semwal <sumit.semwal@linaro.org>
Subject: [PATCH] dma-buf: Correct dummy function declarations.
Date: Fri, 23 Mar 2012 21:19:17 +0530 [thread overview]
Message-ID: <1332517757-25532-1-git-send-email-sumit.semwal@ti.com> (raw)
While testing, I found that we need to correct some of the dummy declarations. When I send my pull request to Linus, I wish to squash these changes into the original patches from Daniel. Could you please review?
Best regards,
~Sumit
=========
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 | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
index f08028e..779aaf9 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 */
--
1.7.5.4
next reply other threads:[~2012-03-23 15:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-23 15:49 Sumit Semwal [this message]
2012-03-23 17:52 ` [PATCH] dma-buf: Correct dummy function declarations Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1332517757-25532-1-git-send-email-sumit.semwal@ti.com \
--to=sumit.semwal@ti.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-media@vger.kernel.org \
--cc=sumit.semwal@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox