[PATCH] dma-buf: fix disabled vmap function

[PATCH] dma-buf: fix disabled vmap function

[Dave Airlie]

From: Dave Airlie <airlied@redhat.com>

include/linux/dma-buf.h: In function ‘dma_buf_vmap’:
include/linux/dma-buf.h:260:1: warning: no return statement in function returning non-void [-Wreturn-type]

Reported-by: wfg@linux.intel.com
Signed-off-by: Dave Airlie <airlied@redhat.com>
---
 include/linux/dma-buf.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
index d8c2865..506bb7b 100644
--- a/include/linux/dma-buf.h
+++ b/include/linux/dma-buf.h
@@ -257,6 +257,7 @@ static inline void dma_buf_kunmap(struct dma_buf *dmabuf,
 
 static inline void *dma_buf_vmap(struct dma_buf *dmabuf)
 {
+	return NULL;
 }
 
 static inline void dma_buf_vunmap(struct dma_buf *dmabuf, void *vaddr)
-- 
1.7.6

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [Linaro-mm-sig] [PATCH] dma-buf: fix disabled vmap function

[Sumit Semwal]

Hi Dave,

On 25 May 2012 14:34, Dave Airlie <airlied@gmail.com> wrote:
> From: Dave Airlie <airlied@redhat.com>
>
> include/linux/dma-buf.h: In function ‘dma_buf_vmap’:
> include/linux/dma-buf.h:260:1: warning: no return statement in function returning non-void [-Wreturn-type]
>
> Reported-by: wfg@linux.intel.com
> Signed-off-by: Dave Airlie <airlied@redhat.com>
> ---
>  include/linux/dma-buf.h |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
> index d8c2865..506bb7b 100644
> --- a/include/linux/dma-buf.h
> +++ b/include/linux/dma-buf.h
> @@ -257,6 +257,7 @@ static inline void dma_buf_kunmap(struct dma_buf *dmabuf,
>
>  static inline void *dma_buf_vmap(struct dma_buf *dmabuf)
>  {
> +       return NULL;
>  }
I fixed this as part of rebasing while applying your vmap patch to my
for-next - so it is already in my pull request.

Best regards,
~Sumit.
>
>  static inline void dma_buf_vunmap(struct dma_buf *dmabuf, void *vaddr)
> --
> 1.7.6
>
>
> _______________________________________________
> Linaro-mm-sig mailing list
> Linaro-mm-sig@lists.linaro.org
> http://lists.linaro.org/mailman/listinfo/linaro-mm-sig

Re: [Linaro-mm-sig] [PATCH] dma-buf: fix disabled vmap function

[Dave Airlie]

On Fri, May 25, 2012 at 10:18 AM, Sumit Semwal <sumit.semwal@linaro.org> wrote:
> Hi Dave,
>
> On 25 May 2012 14:34, Dave Airlie <airlied@gmail.com> wrote:
>> From: Dave Airlie <airlied@redhat.com>
>>
>> include/linux/dma-buf.h: In function ‘dma_buf_vmap’:
>> include/linux/dma-buf.h:260:1: warning: no return statement in function returning non-void [-Wreturn-type]
>>
>> Reported-by: wfg@linux.intel.com
>> Signed-off-by: Dave Airlie <airlied@redhat.com>
>> ---
>>  include/linux/dma-buf.h |    1 +
>>  1 files changed, 1 insertions(+), 0 deletions(-)
>>
>> diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
>> index d8c2865..506bb7b 100644
>> --- a/include/linux/dma-buf.h
>> +++ b/include/linux/dma-buf.h
>> @@ -257,6 +257,7 @@ static inline void dma_buf_kunmap(struct dma_buf *dmabuf,
>>
>>  static inline void *dma_buf_vmap(struct dma_buf *dmabuf)
>>  {
>> +       return NULL;
>>  }
> I fixed this as part of rebasing while applying your vmap patch to my
> for-next - so it is already in my pull request.
>

Ah I didn't read the full warning mail, it was giving out about Tomasz
tree, he must have merged an older version.

Thanks,
Dave.