diff mbox

media: fix a typo CONFIG_HAVE_GENERIC_DMA_COHERENT in videobuf2-dma-contig.c

Message ID 1353995979-28792-1-git-send-email-prabhakar.lad@ti.com (mailing list archive)
State New, archived
Headers show

Commit Message

Lad, Prabhakar Nov. 27, 2012, 5:59 a.m. UTC 
From: Lad, Prabhakar <prabhakar.lad@ti.com>

from commit 93049b9368a2e257ace66252ab2cc066f3399cad, which adds
a check HAVE_GENERIC_DMA_COHERENT for dma ops, the check was wrongly
made it should have been HAVE_GENERIC_DMA_COHERENT but it was
CONFIG_HAVE_GENERIC_DMA_COHERENT.
This patch fixes the typo, which was causing following build error:

videobuf2-dma-contig.c:743: error: 'vb2_dc_get_dmabuf' undeclared here (not in a function)
make[3]: *** [drivers/media/v4l2-core/videobuf2-dma-contig.o] Error 1

Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
---
 drivers/media/v4l2-core/videobuf2-dma-contig.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Kyungmin Park Nov. 27, 2012, 7:17 a.m. UTC | #1 
Hi,

Does it right to use CONFIG_HAVE_GENERIC_DMA_COHERENT?
it defined at init/Kconfig

config HAVE_GENERIC_DMA_COHERENT
        bool
        default n
and use at C file or header file as CONFIG_ prefix?
e.g., include/asm-generic/dma-coherent.h:#ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT

Thank you,
Kyungmin Park

On 11/27/12, Prabhakar Lad <prabhakar.csengg@gmail.com> wrote:
> From: Lad, Prabhakar <prabhakar.lad@ti.com>
>
> from commit 93049b9368a2e257ace66252ab2cc066f3399cad, which adds
> a check HAVE_GENERIC_DMA_COHERENT for dma ops, the check was wrongly
> made it should have been HAVE_GENERIC_DMA_COHERENT but it was
> CONFIG_HAVE_GENERIC_DMA_COHERENT.
> This patch fixes the typo, which was causing following build error:
>
> videobuf2-dma-contig.c:743: error: 'vb2_dc_get_dmabuf' undeclared here (not
> in a function)
> make[3]: *** [drivers/media/v4l2-core/videobuf2-dma-contig.o] Error 1
>
> Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
> Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
> ---
>  drivers/media/v4l2-core/videobuf2-dma-contig.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c
> b/drivers/media/v4l2-core/videobuf2-dma-contig.c
> index 5729450..dfea692 100644
> --- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
> +++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
> @@ -739,7 +739,7 @@ static void *vb2_dc_attach_dmabuf(void *alloc_ctx,
> struct dma_buf *dbuf,
>  const struct vb2_mem_ops vb2_dma_contig_memops = {
>  	.alloc		= vb2_dc_alloc,
>  	.put		= vb2_dc_put,
> -#ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT
> +#ifdef HAVE_GENERIC_DMA_COHERENT
>  	.get_dmabuf	= vb2_dc_get_dmabuf,
>  #endif
>  	.cookie		= vb2_dc_cookie,
> --
> 1.7.0.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Marek Szyprowski Nov. 27, 2012, 7:23 a.m. UTC | #2 
Hello,

On 11/27/2012 6:59 AM, Prabhakar Lad wrote:
> From: Lad, Prabhakar <prabhakar.lad@ti.com>
>
> from commit 93049b9368a2e257ace66252ab2cc066f3399cad, which adds
> a check HAVE_GENERIC_DMA_COHERENT for dma ops, the check was wrongly
> made it should have been HAVE_GENERIC_DMA_COHERENT but it was
> CONFIG_HAVE_GENERIC_DMA_COHERENT.
> This patch fixes the typo, which was causing following build error:
>
> videobuf2-dma-contig.c:743: error: 'vb2_dc_get_dmabuf' undeclared here (not in a function)
> make[3]: *** [drivers/media/v4l2-core/videobuf2-dma-contig.o] Error 1
>
> Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
> Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>

The CONFIG_HAVE_GENERIC_DMA_COHERENT based patch was a quick workaround
for the build problem in linux-next and should be reverted now. The
correct patch has been posted for drivers/base/dma-mapping.c to LKML,
see http://www.spinics.net/lists/linux-next/msg22890.html

> ---
>   drivers/media/v4l2-core/videobuf2-dma-contig.c |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c
> index 5729450..dfea692 100644
> --- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
> +++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
> @@ -739,7 +739,7 @@ static void *vb2_dc_attach_dmabuf(void *alloc_ctx, struct dma_buf *dbuf,
>   const struct vb2_mem_ops vb2_dma_contig_memops = {
>   	.alloc		= vb2_dc_alloc,
>   	.put		= vb2_dc_put,
> -#ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT
> +#ifdef HAVE_GENERIC_DMA_COHERENT
>   	.get_dmabuf	= vb2_dc_get_dmabuf,
>   #endif
>   	.cookie		= vb2_dc_cookie,

Best regards
Lad, Prabhakar Nov. 27, 2012, 7:39 a.m. UTC | #3 
Hi Marek,

On Tue, Nov 27, 2012 at 12:53 PM, Marek Szyprowski
<m.szyprowski@samsung.com> wrote:
> Hello,
>
>
> On 11/27/2012 6:59 AM, Prabhakar Lad wrote:
>>
>> From: Lad, Prabhakar <prabhakar.lad@ti.com>
>>
>> from commit 93049b9368a2e257ace66252ab2cc066f3399cad, which adds
>> a check HAVE_GENERIC_DMA_COHERENT for dma ops, the check was wrongly
>> made it should have been HAVE_GENERIC_DMA_COHERENT but it was
>> CONFIG_HAVE_GENERIC_DMA_COHERENT.
>> This patch fixes the typo, which was causing following build error:
>>
>> videobuf2-dma-contig.c:743: error: 'vb2_dc_get_dmabuf' undeclared here
>> (not in a function)
>> make[3]: *** [drivers/media/v4l2-core/videobuf2-dma-contig.o] Error 1
>>
>> Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
>> Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
>
>
> The CONFIG_HAVE_GENERIC_DMA_COHERENT based patch was a quick workaround
> for the build problem in linux-next and should be reverted now. The
> correct patch has been posted for drivers/base/dma-mapping.c to LKML,
> see http://www.spinics.net/lists/linux-next/msg22890.html
>
I was referring to this patch from Mauro,
http://git.linuxtv.org/media_tree.git/commitdiff/93049b9368a2e257ace66252ab2cc066f3399cad
which introduced this build error.

Regards,
--Prabhakar Lad
>
>> ---
>>   drivers/media/v4l2-core/videobuf2-dma-contig.c |    2 +-
>>   1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c
>> b/drivers/media/v4l2-core/videobuf2-dma-contig.c
>> index 5729450..dfea692 100644
>> --- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
>> +++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
>> @@ -739,7 +739,7 @@ static void *vb2_dc_attach_dmabuf(void *alloc_ctx,
>> struct dma_buf *dbuf,
>>   const struct vb2_mem_ops vb2_dma_contig_memops = {
>>         .alloc          = vb2_dc_alloc,
>>         .put            = vb2_dc_put,
>> -#ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT
>> +#ifdef HAVE_GENERIC_DMA_COHERENT
>>         .get_dmabuf     = vb2_dc_get_dmabuf,
>>   #endif
>>         .cookie         = vb2_dc_cookie,
>
>
> Best regards
> --
> Marek Szyprowski
> Samsung Poland R&D Center
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Marek Szyprowski Nov. 27, 2012, 7:51 a.m. UTC | #4 
Hello,

On 11/27/2012 8:39 AM, Prabhakar Lad wrote:
> Hi Marek,
>
> On Tue, Nov 27, 2012 at 12:53 PM, Marek Szyprowski
> <m.szyprowski@samsung.com> wrote:
> > Hello,
> >
> >
> > On 11/27/2012 6:59 AM, Prabhakar Lad wrote:
> >>
> >> From: Lad, Prabhakar <prabhakar.lad@ti.com>
> >>
> >> from commit 93049b9368a2e257ace66252ab2cc066f3399cad, which adds
> >> a check HAVE_GENERIC_DMA_COHERENT for dma ops, the check was wrongly
> >> made it should have been HAVE_GENERIC_DMA_COHERENT but it was
> >> CONFIG_HAVE_GENERIC_DMA_COHERENT.
> >> This patch fixes the typo, which was causing following build error:
> >>
> >> videobuf2-dma-contig.c:743: error: 'vb2_dc_get_dmabuf' undeclared here
> >> (not in a function)
> >> make[3]: *** [drivers/media/v4l2-core/videobuf2-dma-contig.o] Error 1
> >>
> >> Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
> >> Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
> >
> >
> > The CONFIG_HAVE_GENERIC_DMA_COHERENT based patch was a quick workaround
> > for the build problem in linux-next and should be reverted now. The
> > correct patch has been posted for drivers/base/dma-mapping.c to LKML,
> > see http://www.spinics.net/lists/linux-next/msg22890.html
>
> I was referring to this patch from Mauro,
> http://git.linuxtv.org/media_tree.git/commitdiff/93049b9368a2e257ace66252ab2cc066f3399cad
> which introduced this build error.

I know, with my patch the workaround introduced by Mauro is not needed 
at all.

Best regards
Lad, Prabhakar Nov. 27, 2012, 9:25 a.m. UTC | #5 
Hi,

On Tue, Nov 27, 2012 at 1:21 PM, Marek Szyprowski
<m.szyprowski@samsung.com> wrote:
> Hello,
>
>
> On 11/27/2012 8:39 AM, Prabhakar Lad wrote:
>>
>> Hi Marek,
>>
>> On Tue, Nov 27, 2012 at 12:53 PM, Marek Szyprowski
>> <m.szyprowski@samsung.com> wrote:
>> > Hello,
>> >
>> >
>> > On 11/27/2012 6:59 AM, Prabhakar Lad wrote:
>> >>
>> >> From: Lad, Prabhakar <prabhakar.lad@ti.com>
>> >>
>> >> from commit 93049b9368a2e257ace66252ab2cc066f3399cad, which adds
>> >> a check HAVE_GENERIC_DMA_COHERENT for dma ops, the check was wrongly
>> >> made it should have been HAVE_GENERIC_DMA_COHERENT but it was
>> >> CONFIG_HAVE_GENERIC_DMA_COHERENT.
>> >> This patch fixes the typo, which was causing following build error:
>> >>
>> >> videobuf2-dma-contig.c:743: error: 'vb2_dc_get_dmabuf' undeclared here
>> >> (not in a function)
>> >> make[3]: *** [drivers/media/v4l2-core/videobuf2-dma-contig.o] Error 1
>> >>
>> >> Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
>> >> Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
>> >
>> >
>> > The CONFIG_HAVE_GENERIC_DMA_COHERENT based patch was a quick workaround
>> > for the build problem in linux-next and should be reverted now. The
>> > correct patch has been posted for drivers/base/dma-mapping.c to LKML,
>> > see http://www.spinics.net/lists/linux-next/msg22890.html
>>
>> I was referring to this patch from Mauro,
>>
>> http://git.linuxtv.org/media_tree.git/commitdiff/93049b9368a2e257ace66252ab2cc066f3399cad
>> which introduced this build error.
>
>
> I know, with my patch the workaround introduced by Mauro is not needed at
> all.
>
Thanks for clarifying I'll drop this patch,  I hope Mauro will revert
his changes.

Regards,
--Prabhakar

>
> Best regards
> --
> Marek Szyprowski
> Samsung Poland R&D Center
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Mauro Carvalho Chehab Nov. 27, 2012, 11:28 a.m. UTC | #6 
Em Tue, 27 Nov 2012 14:55:10 +0530
Prabhakar Lad <prabhakar.csengg@gmail.com> escreveu:

> Hi,
> 
> On Tue, Nov 27, 2012 at 1:21 PM, Marek Szyprowski
> <m.szyprowski@samsung.com> wrote:
> > Hello,
> >
> >
> > On 11/27/2012 8:39 AM, Prabhakar Lad wrote:
> >>
> >> Hi Marek,
> >>
> >> On Tue, Nov 27, 2012 at 12:53 PM, Marek Szyprowski
> >> <m.szyprowski@samsung.com> wrote:
> >> > Hello,
> >> >
> >> >
> >> > On 11/27/2012 6:59 AM, Prabhakar Lad wrote:
> >> >>
> >> >> From: Lad, Prabhakar <prabhakar.lad@ti.com>
> >> >>
> >> >> from commit 93049b9368a2e257ace66252ab2cc066f3399cad, which adds
> >> >> a check HAVE_GENERIC_DMA_COHERENT for dma ops, the check was wrongly
> >> >> made it should have been HAVE_GENERIC_DMA_COHERENT but it was
> >> >> CONFIG_HAVE_GENERIC_DMA_COHERENT.
> >> >> This patch fixes the typo, which was causing following build error:
> >> >>
> >> >> videobuf2-dma-contig.c:743: error: 'vb2_dc_get_dmabuf' undeclared here
> >> >> (not in a function)
> >> >> make[3]: *** [drivers/media/v4l2-core/videobuf2-dma-contig.o] Error 1
> >> >>
> >> >> Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
> >> >> Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
> >> >
> >> >
> >> > The CONFIG_HAVE_GENERIC_DMA_COHERENT based patch was a quick workaround
> >> > for the build problem in linux-next and should be reverted now. The
> >> > correct patch has been posted for drivers/base/dma-mapping.c to LKML,
> >> > see http://www.spinics.net/lists/linux-next/msg22890.html
> >>
> >> I was referring to this patch from Mauro,
> >>
> >> http://git.linuxtv.org/media_tree.git/commitdiff/93049b9368a2e257ace66252ab2cc066f3399cad
> >> which introduced this build error.
> >
> >
> > I know, with my patch the workaround introduced by Mauro is not needed at
> > all.
> >
> Thanks for clarifying I'll drop this patch,  I hope Mauro will revert
> his changes.

Yeah, I'm reverting it right now and applying Marek's one, with Greg's ack.
> 
> Regards,
> --Prabhakar
> 
> >
> > Best regards
> > --
> > Marek Szyprowski
> > Samsung Poland R&D Center
> >
> >
diff mbox

Patch

diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c
index 5729450..dfea692 100644
--- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
@@ -739,7 +739,7 @@  static void *vb2_dc_attach_dmabuf(void *alloc_ctx, struct dma_buf *dbuf,
 const struct vb2_mem_ops vb2_dma_contig_memops = {
 	.alloc		= vb2_dc_alloc,
 	.put		= vb2_dc_put,
-#ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT
+#ifdef HAVE_GENERIC_DMA_COHERENT
 	.get_dmabuf	= vb2_dc_get_dmabuf,
 #endif
 	.cookie		= vb2_dc_cookie,