[media] cx25821: remove video output support

The video output functionality never worked for this driver. Now remove the
creation of the output video nodes as well to prevent users from thinking
that video output is available, when it isn't.

To correctly implement this the video output should use vb2 as well, and
that requires rewriting the output DMA setup. But without hardware to test
I am not able to do that.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/pci/cx25821/Makefile b/drivers/media/pci/cx25821/Makefile
index 5872feb266a6dedaaa2f897aae8899696e3681a0..c8f8598a2b86ceaf81028fa29c1ea535eb722f42 100644 (file)
--- a/drivers/media/pci/cx25821/Makefile
+++ b/drivers/media/pci/cx25821/Makefile
@@ -1,6 +1,6 @@
 cx25821-y   := cx25821-core.o cx25821-cards.o cx25821-i2c.o \
                       cx25821-gpio.o cx25821-medusa-video.o \
-                      cx25821-video.o cx25821-video-upstream.o
+                      cx25821-video.o
 
 obj-$(CONFIG_VIDEO_CX25821) += cx25821.o
 obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o

diff --git a/drivers/media/pci/cx25821/cx25821-core.c b/drivers/media/pci/cx25821/cx25821-core.c
index c1ea24e951f3e97a96d0f0a6a648997190285bc2..559f8293c53a2703327d9c05e798e221800b5bd8 100644 (file)
--- a/drivers/media/pci/cx25821/cx25821-core.c
+++ b/drivers/media/pci/cx25821/cx25821-core.c
@@ -965,11 +965,15 @@ void cx25821_dev_unregister(struct cx25821_dev *dev)
 
        release_mem_region(dev->base_io_addr, pci_resource_len(dev->pci, 0));
 
-       for (i = 0; i < MAX_VID_CHANNEL_NUM - 1; i++) {
+       for (i = 0; i < MAX_VID_CAP_CHANNEL_NUM - 1; i++) {
                if (i == SRAM_CH08) /* audio channel */
                        continue;
+               /*
+                * TODO: enable when video output is properly
+                * supported.
                if (i == SRAM_CH09 || i == SRAM_CH10)
                        cx25821_free_mem_upstream(&dev->channels[i]);
+                */
                cx25821_video_unregister(dev, i);
        }
 

diff --git a/drivers/media/pci/cx25821/cx25821-video.c b/drivers/media/pci/cx25821/cx25821-video.c
index 827c3c036ba3c6af892b5b7c9cb09f7e4e73c1dd..7bc495e4ece259ddc0a23b4248c7d774a41744a1 100644 (file)
--- a/drivers/media/pci/cx25821/cx25821-video.c
+++ b/drivers/media/pci/cx25821/cx25821-video.c
@@ -692,7 +692,7 @@ int cx25821_video_register(struct cx25821_dev *dev)
 
        spin_lock_init(&dev->slock);
 
-       for (i = 0; i < MAX_VID_CHANNEL_NUM - 1; ++i) {
+       for (i = 0; i < MAX_VID_CAP_CHANNEL_NUM - 1; ++i) {
                struct cx25821_channel *chan = &dev->channels[i];
                struct video_device *vdev = &chan->vdev;
                struct v4l2_ctrl_handler *hdl = &chan->hdl;

diff --git a/drivers/media/pci/cx25821/cx25821.h b/drivers/media/pci/cx25821/cx25821.h
index 34c5ff1365982ea5a0f468b9e720b6c4f25a0015..d81a08a2df4f3a8d808b8552d4fc189bc44394ce 100644 (file)
--- a/drivers/media/pci/cx25821/cx25821.h
+++ b/drivers/media/pci/cx25821/cx25821.h
@@ -88,6 +88,13 @@
 
 #define CX25821_BOARD_CONEXANT_ATHENA10 1
 #define MAX_VID_CHANNEL_NUM     12
+
+/*
+ * Maximum capture-only channels. This can go away once video/audio output
+ * is fully supported in this driver.
+ */
+#define MAX_VID_CAP_CHANNEL_NUM     10
+
 #define VID_CHANNEL_NUM 8
 
 struct cx25821_fmt {