media: v4l2-dev: convert VFL_TYPE_* into an enum

Using enums makes easier to document, as it can use kernel-doc
markups. It also allows cross-referencing, with increases the
kAPI readability.

Please notice that now cx88_querycap() has to have a default for
the VFL type, as there are more types than supported by the driver.

Acked-By: Mike Isely <isely@pobox.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

3 files changed, 9 insertions, 8 deletions

diff --git a/drivers/media/pci/cx88/cx88-blackbird.c b/drivers/media/pci/cx88/cx88-blackbird.c
index e3101f04941c..0e0952e60795 100644
--- a/drivers/media/pci/cx88/cx88-blackbird.c
+++ b/drivers/media/pci/cx88/cx88-blackbird.c
@@ -805,8 +805,7 @@ static int vidioc_querycap(struct file *file, void  *priv,
 
         strcpy(cap->driver, "cx88_blackbird");
         sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));
-        cx88_querycap(file, core, cap);
-        return 0;
+        return cx88_querycap(file, core, cap);
 }
 
 static int vidioc_enum_fmt_vid_cap(struct file *file, void  *priv,
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
index 7d25ecd4404b..9be682cdb644 100644
--- a/drivers/media/pci/cx88/cx88-video.c
+++ b/drivers/media/pci/cx88/cx88-video.c
@@ -806,8 +806,8 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
         return 0;
 }
 
-void cx88_querycap(struct file *file, struct cx88_core *core,
-                   struct v4l2_capability *cap)
+int cx88_querycap(struct file *file, struct cx88_core *core,
+                  struct v4l2_capability *cap)
 {
         struct video_device *vdev = video_devdata(file);
 
@@ -825,11 +825,14 @@ void cx88_querycap(struct file *file, struct cx88_core *core,
         case VFL_TYPE_VBI:
                 cap->device_caps |= V4L2_CAP_VBI_CAPTURE;
                 break;
+        default:
+                return -EINVAL;
         }
         cap->capabilities = cap->device_caps | V4L2_CAP_VIDEO_CAPTURE |
                 V4L2_CAP_VBI_CAPTURE | V4L2_CAP_DEVICE_CAPS;
         if (core->board.radio.type == CX88_RADIO)
                 cap->capabilities |= V4L2_CAP_RADIO;
+        return 0;
 }
 EXPORT_SYMBOL(cx88_querycap);
 
@@ -841,8 +844,7 @@ static int vidioc_querycap(struct file *file, void  *priv,
 
         strcpy(cap->driver, "cx8800");
         sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));
-        cx88_querycap(file, core, cap);
-        return 0;
+        return cx88_querycap(file, core, cap);
 }
 
 static int vidioc_enum_fmt_vid_cap(struct file *file, void  *priv,
diff --git a/drivers/media/pci/cx88/cx88.h b/drivers/media/pci/cx88/cx88.h
index 6777926f20f2..07a33f02fef4 100644
--- a/drivers/media/pci/cx88/cx88.h
+++ b/drivers/media/pci/cx88/cx88.h
@@ -734,7 +734,7 @@ int cx8802_start_dma(struct cx8802_dev    *dev,
 int cx88_enum_input(struct cx88_core *core, struct v4l2_input *i);
 int cx88_set_freq(struct cx88_core  *core, const struct v4l2_frequency *f);
 int cx88_video_mux(struct cx88_core *core, unsigned int input);
-void cx88_querycap(struct file *file, struct cx88_core *core,
-                   struct v4l2_capability *cap);
+int cx88_querycap(struct file *file, struct cx88_core *core,
+                  struct v4l2_capability *cap);
 
 #endif