[media] uvcvideo: Make the API public

Move the public API definitions to include/linux/uvcvideo.h and bump the
version number to 1.1.0. Compatibility with the old API is kept,
application can still be compiled against the private header and will
not break.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c
index 2e2a556d1666..6e8aad44c4bd 100644
--- a/drivers/media/video/uvc/uvc_v4l2.c
+++ b/drivers/media/video/uvc/uvc_v4l2.c
@@ -1036,24 +1036,25 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
          * UVCIOC_CTRL_GET and UVCIOC_CTRL_SET are deprecated and scheduled for
          * removal in 2.6.42.
          */
-        case UVCIOC_CTRL_ADD:
+        case __UVCIOC_CTRL_ADD:
                 uvc_v4l2_ioctl_warn();
                 return -EEXIST;
 
-        case UVCIOC_CTRL_MAP_OLD:
+        case __UVCIOC_CTRL_MAP_OLD:
                 uvc_v4l2_ioctl_warn();
+        case __UVCIOC_CTRL_MAP:
         case UVCIOC_CTRL_MAP:
                 return uvc_ioctl_ctrl_map(chain, arg,
-                                          cmd == UVCIOC_CTRL_MAP_OLD);
+                                          cmd == __UVCIOC_CTRL_MAP_OLD);
 
-        case UVCIOC_CTRL_GET:
-        case UVCIOC_CTRL_SET:
+        case __UVCIOC_CTRL_GET:
+        case __UVCIOC_CTRL_SET:
         {
                 struct uvc_xu_control *xctrl = arg;
                 struct uvc_xu_control_query xqry = {
                         .unit           = xctrl->unit,
                         .selector       = xctrl->selector,
-                        .query          = cmd == UVCIOC_CTRL_GET
+                        .query          = cmd == __UVCIOC_CTRL_GET
                                         ? UVC_GET_CUR : UVC_SET_CUR,
                         .size           = xctrl->size,
                         .data           = xctrl->data,