[-next] staging/media: fix msi3101 build errors

Commit Message

Randy Dunlap Sept. 12, 2013, 5:42 p.m. UTC

From: Randy Dunlap <[e-mail]>

Fix build error when VIDEOBUF2_CORE=m and USB_MSI3101=y.

drivers/built-in.o: In function `msi3101_buf_queue':
sdr-msi3101.c:(.text+0x1298d6): undefined reference to `vb2_buffer_done'
drivers/built-in.o: In function `msi3101_cleanup_queued_bufs':
sdr-msi3101.c:(.text+0x1299c7): undefined reference to `vb2_buffer_done'
drivers/built-in.o: In function `msi3101_isoc_handler':
sdr-msi3101.c:(.text+0x12a08d): undefined reference to `vb2_plane_vaddr'
sdr-msi3101.c:(.text+0x12a0b9): undefined reference to `vb2_buffer_done'
drivers/built-in.o: In function `msi3101_probe':
sdr-msi3101.c:(.text+0x12a1c5): undefined reference to `vb2_vmalloc_memops'
sdr-msi3101.c:(.text+0x12a1d7): undefined reference to `vb2_queue_init'
drivers/built-in.o:(.rodata+0x34cf0): undefined reference to `vb2_ioctl_reqbufs'
drivers/built-in.o:(.rodata+0x34cf4): undefined reference to `vb2_ioctl_querybuf'
drivers/built-in.o:(.rodata+0x34cf8): undefined reference to `vb2_ioctl_qbuf'
drivers/built-in.o:(.rodata+0x34d00): undefined reference to `vb2_ioctl_dqbuf'
drivers/built-in.o:(.rodata+0x34d04): undefined reference to `vb2_ioctl_create_bufs'
drivers/built-in.o:(.rodata+0x34d08): undefined reference to `vb2_ioctl_prepare_buf'
drivers/built-in.o:(.rodata+0x34d18): undefined reference to `vb2_ioctl_streamon'
drivers/built-in.o:(.rodata+0x34d1c): undefined reference to `vb2_ioctl_streamoff'
drivers/built-in.o:(.rodata+0x35580): undefined reference to `vb2_fop_read'
drivers/built-in.o:(.rodata+0x35588): undefined reference to `vb2_fop_poll'
drivers/built-in.o:(.rodata+0x35598): undefined reference to `vb2_fop_mmap'
drivers/built-in.o:(.rodata+0x355a0): undefined reference to `vb2_fop_release'
drivers/built-in.o:(.data+0x23b40): undefined reference to `vb2_ops_wait_prepare'
drivers/built-in.o:(.data+0x23b44): undefined reference to `vb2_ops_wait_finish'

Signed-off-by: Randy Dunlap <[e-mail]>
Cc: Antti Palosaari <[e-mail]>
---
 drivers/staging/media/msi3101/Kconfig |    2 ++
 1 file changed, 2 insertions(+)

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Antti Palosaari Sept. 12, 2013, 6:01 p.m. UTC | #1

Hello Randy,
It is already fixed, waiting for Mauro's processing.
https://patchwork.kernel.org/patch/2856771/

regards
Antti

On 09/12/2013 08:42 PM, Randy Dunlap wrote:
> From: Randy Dunlap <[e-mail]>
>
> Fix build error when VIDEOBUF2_CORE=m and USB_MSI3101=y.
>
> drivers/built-in.o: In function `msi3101_buf_queue':
> sdr-msi3101.c:(.text+0x1298d6): undefined reference to `vb2_buffer_done'
> drivers/built-in.o: In function `msi3101_cleanup_queued_bufs':
> sdr-msi3101.c:(.text+0x1299c7): undefined reference to `vb2_buffer_done'
> drivers/built-in.o: In function `msi3101_isoc_handler':
> sdr-msi3101.c:(.text+0x12a08d): undefined reference to `vb2_plane_vaddr'
> sdr-msi3101.c:(.text+0x12a0b9): undefined reference to `vb2_buffer_done'
> drivers/built-in.o: In function `msi3101_probe':
> sdr-msi3101.c:(.text+0x12a1c5): undefined reference to `vb2_vmalloc_memops'
> sdr-msi3101.c:(.text+0x12a1d7): undefined reference to `vb2_queue_init'
> drivers/built-in.o:(.rodata+0x34cf0): undefined reference to `vb2_ioctl_reqbufs'
> drivers/built-in.o:(.rodata+0x34cf4): undefined reference to `vb2_ioctl_querybuf'
> drivers/built-in.o:(.rodata+0x34cf8): undefined reference to `vb2_ioctl_qbuf'
> drivers/built-in.o:(.rodata+0x34d00): undefined reference to `vb2_ioctl_dqbuf'
> drivers/built-in.o:(.rodata+0x34d04): undefined reference to `vb2_ioctl_create_bufs'
> drivers/built-in.o:(.rodata+0x34d08): undefined reference to `vb2_ioctl_prepare_buf'
> drivers/built-in.o:(.rodata+0x34d18): undefined reference to `vb2_ioctl_streamon'
> drivers/built-in.o:(.rodata+0x34d1c): undefined reference to `vb2_ioctl_streamoff'
> drivers/built-in.o:(.rodata+0x35580): undefined reference to `vb2_fop_read'
> drivers/built-in.o:(.rodata+0x35588): undefined reference to `vb2_fop_poll'
> drivers/built-in.o:(.rodata+0x35598): undefined reference to `vb2_fop_mmap'
> drivers/built-in.o:(.rodata+0x355a0): undefined reference to `vb2_fop_release'
> drivers/built-in.o:(.data+0x23b40): undefined reference to `vb2_ops_wait_prepare'
> drivers/built-in.o:(.data+0x23b44): undefined reference to `vb2_ops_wait_finish'
>
> Signed-off-by: Randy Dunlap <[e-mail]>
> Cc: Antti Palosaari <[e-mail]>
> ---
>   drivers/staging/media/msi3101/Kconfig |    2 ++
>   1 file changed, 2 insertions(+)
>
> --- linux-next-20130912.orig/drivers/staging/media/msi3101/Kconfig
> +++ linux-next-20130912/drivers/staging/media/msi3101/Kconfig
> @@ -1,3 +1,5 @@
>   config USB_MSI3101
>   	tristate "Mirics MSi3101 SDR Dongle"
>   	depends on USB && VIDEO_DEV && VIDEO_V4L2
> +	select VIDEOBUF2_CORE
> +	select VIDEOBUF2_VMALLOC
>

Mauro Carvalho Chehab Sept. 12, 2013, 6:24 p.m. UTC | #2

Em Thu, 12 Sep 2013 21:01:51 +0300
Antti Palosaari <[e-mail]> escreveu:

> Hello Randy,
> It is already fixed, waiting for Mauro's processing.
> https://patchwork.kernel.org/patch/2856771/

Ok. I'll handle the patches after the release of -rc1.

Regards,
Mauro

> 
> regards
> Antti
> 
> On 09/12/2013 08:42 PM, Randy Dunlap wrote:
> > From: Randy Dunlap <[e-mail]>
> >
> > Fix build error when VIDEOBUF2_CORE=m and USB_MSI3101=y.
> >
> > drivers/built-in.o: In function `msi3101_buf_queue':
> > sdr-msi3101.c:(.text+0x1298d6): undefined reference to `vb2_buffer_done'
> > drivers/built-in.o: In function `msi3101_cleanup_queued_bufs':
> > sdr-msi3101.c:(.text+0x1299c7): undefined reference to `vb2_buffer_done'
> > drivers/built-in.o: In function `msi3101_isoc_handler':
> > sdr-msi3101.c:(.text+0x12a08d): undefined reference to `vb2_plane_vaddr'
> > sdr-msi3101.c:(.text+0x12a0b9): undefined reference to `vb2_buffer_done'
> > drivers/built-in.o: In function `msi3101_probe':
> > sdr-msi3101.c:(.text+0x12a1c5): undefined reference to `vb2_vmalloc_memops'
> > sdr-msi3101.c:(.text+0x12a1d7): undefined reference to `vb2_queue_init'
> > drivers/built-in.o:(.rodata+0x34cf0): undefined reference to `vb2_ioctl_reqbufs'
> > drivers/built-in.o:(.rodata+0x34cf4): undefined reference to `vb2_ioctl_querybuf'
> > drivers/built-in.o:(.rodata+0x34cf8): undefined reference to `vb2_ioctl_qbuf'
> > drivers/built-in.o:(.rodata+0x34d00): undefined reference to `vb2_ioctl_dqbuf'
> > drivers/built-in.o:(.rodata+0x34d04): undefined reference to `vb2_ioctl_create_bufs'
> > drivers/built-in.o:(.rodata+0x34d08): undefined reference to `vb2_ioctl_prepare_buf'
> > drivers/built-in.o:(.rodata+0x34d18): undefined reference to `vb2_ioctl_streamon'
> > drivers/built-in.o:(.rodata+0x34d1c): undefined reference to `vb2_ioctl_streamoff'
> > drivers/built-in.o:(.rodata+0x35580): undefined reference to `vb2_fop_read'
> > drivers/built-in.o:(.rodata+0x35588): undefined reference to `vb2_fop_poll'
> > drivers/built-in.o:(.rodata+0x35598): undefined reference to `vb2_fop_mmap'
> > drivers/built-in.o:(.rodata+0x355a0): undefined reference to `vb2_fop_release'
> > drivers/built-in.o:(.data+0x23b40): undefined reference to `vb2_ops_wait_prepare'
> > drivers/built-in.o:(.data+0x23b44): undefined reference to `vb2_ops_wait_finish'
> >
> > Signed-off-by: Randy Dunlap <[e-mail]>
> > Cc: Antti Palosaari <[e-mail]>
> > ---
> >   drivers/staging/media/msi3101/Kconfig |    2 ++
> >   1 file changed, 2 insertions(+)
> >
> > --- linux-next-20130912.orig/drivers/staging/media/msi3101/Kconfig
> > +++ linux-next-20130912/drivers/staging/media/msi3101/Kconfig
> > @@ -1,3 +1,5 @@
> >   config USB_MSI3101
> >   	tristate "Mirics MSi3101 SDR Dongle"
> >   	depends on USB && VIDEO_DEV && VIDEO_V4L2
> > +	select VIDEOBUF2_CORE
> > +	select VIDEOBUF2_VMALLOC
> >
> 
>

Patch

--- linux-next-20130912.orig/drivers/staging/media/msi3101/Kconfig
+++ linux-next-20130912/drivers/staging/media/msi3101/Kconfig
@@ -1,3 +1,5 @@ 
 config USB_MSI3101
 	tristate "Mirics MSi3101 SDR Dongle"
 	depends on USB && VIDEO_DEV && VIDEO_V4L2
+	select VIDEOBUF2_CORE
+	select VIDEOBUF2_VMALLOC