media: uvcvideo: refactor __uvc_ctrl_add_mapping

[ Upstream commit 866c6bdd5663d4df7cf384b381b6ef8ba9ffd0e4 ]

Pass the chain instead of the device. We want to keep the reference to
the chain that controls belong to.

We need to delay the initialization of the controls after the chains
have been initialized.

This is a cleanup needed for the next patches.

Reviewed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Stable-dep-of: 9f582f0418ed ("media: uvcvideo: Check for INACTIVE in uvc_ctrl_is_accessible()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index 5bb29fc49538ea7b7dee365c828fe8bd13096875..6b089103878acf356c5f9c3a23b4d05aee205a1c 100644 (file)
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -2066,7 +2066,7 @@ static int uvc_ctrl_add_info(struct uvc_device *dev, struct uvc_control *ctrl,
 /*
  * Add a control mapping to a given control.
  */
-static int __uvc_ctrl_add_mapping(struct uvc_device *dev,
+static int __uvc_ctrl_add_mapping(struct uvc_video_chain *chain,
        struct uvc_control *ctrl, const struct uvc_control_mapping *mapping)
 {
        struct uvc_control_mapping *map;
@@ -2095,7 +2095,7 @@ static int __uvc_ctrl_add_mapping(struct uvc_device *dev,
                map->set = uvc_set_le_value;
 
        list_add_tail(&map->list, &ctrl->info.mappings);
-       uvc_dbg(dev, CONTROL, "Adding mapping '%s' to control %pUl/%u\n",
+       uvc_dbg(chain->dev, CONTROL, "Adding mapping '%s' to control %pUl/%u\n",
                map->name, ctrl->info.entity, ctrl->info.selector);
 
        return 0;
@@ -2177,7 +2177,7 @@ int uvc_ctrl_add_mapping(struct uvc_video_chain *chain,
                goto done;
        }
 
-       ret = __uvc_ctrl_add_mapping(dev, ctrl, mapping);
+       ret = __uvc_ctrl_add_mapping(chain, ctrl, mapping);
        if (ret < 0)
                atomic_dec(&dev->nmappings);
 
@@ -2253,7 +2253,8 @@ static void uvc_ctrl_prune_entity(struct uvc_device *dev,
  * Add control information and hardcoded stock control mappings to the given
  * device.
  */
-static void uvc_ctrl_init_ctrl(struct uvc_device *dev, struct uvc_control *ctrl)
+static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain,
+                              struct uvc_control *ctrl)
 {
        const struct uvc_control_info *info = uvc_ctrls;
        const struct uvc_control_info *iend = info + ARRAY_SIZE(uvc_ctrls);
@@ -2272,14 +2273,14 @@ static void uvc_ctrl_init_ctrl(struct uvc_device *dev, struct uvc_control *ctrl)
        for (; info < iend; ++info) {
                if (uvc_entity_match_guid(ctrl->entity, info->entity) &&
                    ctrl->index == info->index) {
-                       uvc_ctrl_add_info(dev, ctrl, info);
+                       uvc_ctrl_add_info(chain->dev, ctrl, info);
                        /*
                         * Retrieve control flags from the device. Ignore errors
                         * and work with default flag values from the uvc_ctrl
                         * array when the device doesn't properly implement
                         * GET_INFO on standard controls.
                         */
-                       uvc_ctrl_get_flags(dev, ctrl, &ctrl->info);
+                       uvc_ctrl_get_flags(chain->dev, ctrl, &ctrl->info);
                        break;
                 }
        }
@@ -2290,22 +2291,20 @@ static void uvc_ctrl_init_ctrl(struct uvc_device *dev, struct uvc_control *ctrl)
        for (; mapping < mend; ++mapping) {
                if (uvc_entity_match_guid(ctrl->entity, mapping->entity) &&
                    ctrl->info.selector == mapping->selector)
-                       __uvc_ctrl_add_mapping(dev, ctrl, mapping);
+                       __uvc_ctrl_add_mapping(chain, ctrl, mapping);
        }
 }
 
 /*
  * Initialize device controls.
  */
-int uvc_ctrl_init_device(struct uvc_device *dev)
+static int uvc_ctrl_init_chain(struct uvc_video_chain *chain)
 {
        struct uvc_entity *entity;
        unsigned int i;
 
-       INIT_WORK(&dev->async_ctrl.work, uvc_ctrl_status_event_work);
-
        /* Walk the entities list and instantiate controls */
-       list_for_each_entry(entity, &dev->entities, list) {
+       list_for_each_entry(entity, &chain->entities, chain) {
                struct uvc_control *ctrl;
                unsigned int bControlSize = 0, ncontrols;
                u8 *bmControls = NULL;
@@ -2325,7 +2324,7 @@ int uvc_ctrl_init_device(struct uvc_device *dev)
                }
 
                /* Remove bogus/blacklisted controls */
-               uvc_ctrl_prune_entity(dev, entity);
+               uvc_ctrl_prune_entity(chain->dev, entity);
 
                /* Count supported controls and allocate the controls array */
                ncontrols = memweight(bmControls, bControlSize);
@@ -2347,7 +2346,7 @@ int uvc_ctrl_init_device(struct uvc_device *dev)
                        ctrl->entity = entity;
                        ctrl->index = i;
 
-                       uvc_ctrl_init_ctrl(dev, ctrl);
+                       uvc_ctrl_init_ctrl(chain, ctrl);
                        ctrl++;
                }
        }
@@ -2355,6 +2354,22 @@ int uvc_ctrl_init_device(struct uvc_device *dev)
        return 0;
 }
 
+int uvc_ctrl_init_device(struct uvc_device *dev)
+{
+       struct uvc_video_chain *chain;
+       int ret;
+
+       INIT_WORK(&dev->async_ctrl.work, uvc_ctrl_status_event_work);
+
+       list_for_each_entry(chain, &dev->chains, list) {
+               ret = uvc_ctrl_init_chain(chain);
+               if (ret)
+                       return ret;
+       }
+
+       return 0;
+}
+
 /*
  * Cleanup device controls.
  */

diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index 72fff7264b549e44ea7484307685868571b1d4d4..ceae2eabc0a1c7e11a2b202864d5e0bc636d88d7 100644 (file)
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -2455,14 +2455,14 @@ static int uvc_probe(struct usb_interface *intf,
        if (v4l2_device_register(&intf->dev, &dev->vdev) < 0)
                goto error;
 
-       /* Initialize controls. */
-       if (uvc_ctrl_init_device(dev) < 0)
-               goto error;
-
        /* Scan the device for video chains. */
        if (uvc_scan_device(dev) < 0)
                goto error;
 
+       /* Initialize controls. */
+       if (uvc_ctrl_init_device(dev) < 0)
+               goto error;
+
        /* Register video device nodes. */
        if (uvc_register_chains(dev) < 0)
                goto error;