[media] cx18/ivtv: Remove usage of V4L2_BUF_TYPE_PRIVATE

V4L2_BUF_TYPE_PRIVATE was used in these driver for internal purposes.
It turned out though that it wasn't used at all, so it could be removed.
I know it was used in the past, but clearly later changes made this
obsolete.

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

2 files changed, 16 insertions, 18 deletions

diff --git a/drivers/media/pci/cx18/cx18-streams.c b/drivers/media/pci/cx18/cx18-streams.c
index 9d598ab88615..72af9b5c2d7d 100644
--- a/drivers/media/pci/cx18/cx18-streams.c
+++ b/drivers/media/pci/cx18/cx18-streams.c
@@ -58,42 +58,41 @@ static struct {
         int vfl_type;
         int num_offset;
         int dma;
-        enum v4l2_buf_type buf_type;
 } cx18_stream_info[] = {
         {       /* CX18_ENC_STREAM_TYPE_MPG */
                 "encoder MPEG",
                 VFL_TYPE_GRABBER, 0,
-                PCI_DMA_FROMDEVICE, V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                PCI_DMA_FROMDEVICE,
         },
         {       /* CX18_ENC_STREAM_TYPE_TS */
                 "TS",
                 VFL_TYPE_GRABBER, -1,
-                PCI_DMA_FROMDEVICE, V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                PCI_DMA_FROMDEVICE,
         },
         {       /* CX18_ENC_STREAM_TYPE_YUV */
                 "encoder YUV",
                 VFL_TYPE_GRABBER, CX18_V4L2_ENC_YUV_OFFSET,
-                PCI_DMA_FROMDEVICE, V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                PCI_DMA_FROMDEVICE,
         },
         {       /* CX18_ENC_STREAM_TYPE_VBI */
                 "encoder VBI",
                 VFL_TYPE_VBI, 0,
-                PCI_DMA_FROMDEVICE, V4L2_BUF_TYPE_VBI_CAPTURE,
+                PCI_DMA_FROMDEVICE,
         },
         {       /* CX18_ENC_STREAM_TYPE_PCM */
                 "encoder PCM audio",
                 VFL_TYPE_GRABBER, CX18_V4L2_ENC_PCM_OFFSET,
-                PCI_DMA_FROMDEVICE, V4L2_BUF_TYPE_PRIVATE,
+                PCI_DMA_FROMDEVICE,
         },
         {       /* CX18_ENC_STREAM_TYPE_IDX */
                 "encoder IDX",
                 VFL_TYPE_GRABBER, -1,
-                PCI_DMA_FROMDEVICE, V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                PCI_DMA_FROMDEVICE,
         },
         {       /* CX18_ENC_STREAM_TYPE_RAD */
                 "encoder radio",
                 VFL_TYPE_RADIO, 0,
-                PCI_DMA_NONE, V4L2_BUF_TYPE_PRIVATE,
+                PCI_DMA_NONE,
         },
 };
 
diff --git a/drivers/media/pci/ivtv/ivtv-streams.c b/drivers/media/pci/ivtv/ivtv-streams.c
index ea6135203f58..0ff264e0e0f6 100644
--- a/drivers/media/pci/ivtv/ivtv-streams.c
+++ b/drivers/media/pci/ivtv/ivtv-streams.c
@@ -77,14 +77,13 @@ static struct {
         int vfl_type;
         int num_offset;
         int dma, pio;
-        enum v4l2_buf_type buf_type;
         u32 v4l2_caps;
         const struct v4l2_file_operations *fops;
 } ivtv_stream_info[] = {
         {       /* IVTV_ENC_STREAM_TYPE_MPG */
                 "encoder MPG",
                 VFL_TYPE_GRABBER, 0,
-                PCI_DMA_FROMDEVICE, 0, V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                PCI_DMA_FROMDEVICE, 0,
                 V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_TUNER |
                         V4L2_CAP_AUDIO | V4L2_CAP_READWRITE,
                 &ivtv_v4l2_enc_fops
@@ -92,7 +91,7 @@ static struct {
         {       /* IVTV_ENC_STREAM_TYPE_YUV */
                 "encoder YUV",
                 VFL_TYPE_GRABBER, IVTV_V4L2_ENC_YUV_OFFSET,
-                PCI_DMA_FROMDEVICE, 0, V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                PCI_DMA_FROMDEVICE, 0,
                 V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_TUNER |
                         V4L2_CAP_AUDIO | V4L2_CAP_READWRITE,
                 &ivtv_v4l2_enc_fops
@@ -100,7 +99,7 @@ static struct {
         {       /* IVTV_ENC_STREAM_TYPE_VBI */
                 "encoder VBI",
                 VFL_TYPE_VBI, 0,
-                PCI_DMA_FROMDEVICE, 0, V4L2_BUF_TYPE_VBI_CAPTURE,
+                PCI_DMA_FROMDEVICE, 0,
                 V4L2_CAP_VBI_CAPTURE | V4L2_CAP_SLICED_VBI_CAPTURE | V4L2_CAP_TUNER |
                         V4L2_CAP_AUDIO | V4L2_CAP_READWRITE,
                 &ivtv_v4l2_enc_fops
@@ -108,42 +107,42 @@ static struct {
         {       /* IVTV_ENC_STREAM_TYPE_PCM */
                 "encoder PCM",
                 VFL_TYPE_GRABBER, IVTV_V4L2_ENC_PCM_OFFSET,
-                PCI_DMA_FROMDEVICE, 0, V4L2_BUF_TYPE_PRIVATE,
+                PCI_DMA_FROMDEVICE, 0,
                 V4L2_CAP_TUNER | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE,
                 &ivtv_v4l2_enc_fops
         },
         {       /* IVTV_ENC_STREAM_TYPE_RAD */
                 "encoder radio",
                 VFL_TYPE_RADIO, 0,
-                PCI_DMA_NONE, 1, V4L2_BUF_TYPE_PRIVATE,
+                PCI_DMA_NONE, 1,
                 V4L2_CAP_RADIO | V4L2_CAP_TUNER,
                 &ivtv_v4l2_enc_fops
         },
         {       /* IVTV_DEC_STREAM_TYPE_MPG */
                 "decoder MPG",
                 VFL_TYPE_GRABBER, IVTV_V4L2_DEC_MPG_OFFSET,
-                PCI_DMA_TODEVICE, 0, V4L2_BUF_TYPE_VIDEO_OUTPUT,
+                PCI_DMA_TODEVICE, 0,
                 V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE,
                 &ivtv_v4l2_dec_fops
         },
         {       /* IVTV_DEC_STREAM_TYPE_VBI */
                 "decoder VBI",
                 VFL_TYPE_VBI, IVTV_V4L2_DEC_VBI_OFFSET,
-                PCI_DMA_NONE, 1, V4L2_BUF_TYPE_VBI_CAPTURE,
+                PCI_DMA_NONE, 1,
                 V4L2_CAP_SLICED_VBI_CAPTURE | V4L2_CAP_READWRITE,
                 &ivtv_v4l2_enc_fops
         },
         {       /* IVTV_DEC_STREAM_TYPE_VOUT */
                 "decoder VOUT",
                 VFL_TYPE_VBI, IVTV_V4L2_DEC_VOUT_OFFSET,
-                PCI_DMA_NONE, 1, V4L2_BUF_TYPE_VBI_OUTPUT,
+                PCI_DMA_NONE, 1,
                 V4L2_CAP_SLICED_VBI_OUTPUT | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE,
                 &ivtv_v4l2_dec_fops
         },
         {       /* IVTV_DEC_STREAM_TYPE_YUV */
                 "decoder YUV",
                 VFL_TYPE_GRABBER, IVTV_V4L2_DEC_YUV_OFFSET,
-                PCI_DMA_TODEVICE, 0, V4L2_BUF_TYPE_VIDEO_OUTPUT,
+                PCI_DMA_TODEVICE, 0,
                 V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE,
                 &ivtv_v4l2_dec_fops
         }