]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
media: v4l: async: Remove re-probing support
authorSakari Ailus <sakari.ailus@linux.intel.com>
Tue, 5 Sep 2017 12:11:59 +0000 (08:11 -0400)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Tue, 31 Oct 2017 16:11:01 +0000 (12:11 -0400)
Remove V4L2 async re-probing support. The re-probing support has been
there to support cases where the sub-devices require resources provided by
the main driver's hardware to function, such as clocks.

Reprobing has allowed unbinding and again binding the main driver without
explicitly unbinding the sub-device drivers. This is certainly not a
common need, and the responsibility will be the user's going forward.

An alternative could have been to introduce notifier specific locks.
Considering the complexity of the re-probing and that it isn't really a
solution to a problem but a workaround, remove re-probing instead.

If there is a need to support the clock provider unregister/register cycle
while keeping the clock references in the consumers in the future, this
should be implemented in the clock framework instead, not in V4L2.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Acked-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/v4l2-core/v4l2-async.c

index d741a8e0fdac6d60202391c54e5c832006c2c9a1..60a1a50b9537cca881967d620ae8e24510d7e1b2 100644 (file)
@@ -198,78 +198,26 @@ EXPORT_SYMBOL(v4l2_async_notifier_register);
 void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
 {
        struct v4l2_subdev *sd, *tmp;
-       unsigned int notif_n_subdev = notifier->num_subdevs;
-       unsigned int n_subdev = min(notif_n_subdev, V4L2_MAX_SUBDEVS);
-       struct device **dev;
-       int i = 0;
 
        if (!notifier->v4l2_dev)
                return;
 
-       dev = kvmalloc_array(n_subdev, sizeof(*dev), GFP_KERNEL);
-       if (!dev) {
-               dev_err(notifier->v4l2_dev->dev,
-                       "Failed to allocate device cache!\n");
-       }
-
        mutex_lock(&list_lock);
 
        list_del(&notifier->list);
 
        list_for_each_entry_safe(sd, tmp, &notifier->done, async_list) {
-               struct device *d;
-
-               d = get_device(sd->dev);
-
                v4l2_async_cleanup(sd);
 
-               /* If we handled USB devices, we'd have to lock the parent too */
-               device_release_driver(d);
-
                if (notifier->unbind)
                        notifier->unbind(notifier, sd, sd->asd);
 
-               /*
-                * Store device at the device cache, in order to call
-                * put_device() on the final step
-                */
-               if (dev)
-                       dev[i++] = d;
-               else
-                       put_device(d);
+               list_move(&sd->async_list, &subdev_list);
        }
 
        mutex_unlock(&list_lock);
 
-       /*
-        * Call device_attach() to reprobe devices
-        *
-        * NOTE: If dev allocation fails, i is 0, and the whole loop won't be
-        * executed.
-        */
-       while (i--) {
-               struct device *d = dev[i];
-
-               if (d && device_attach(d) < 0) {
-                       const char *name = "(none)";
-                       int lock = device_trylock(d);
-
-                       if (lock && d->driver)
-                               name = d->driver->name;
-                       dev_err(d, "Failed to re-probe to %s\n", name);
-                       if (lock)
-                               device_unlock(d);
-               }
-               put_device(d);
-       }
-       kvfree(dev);
-
        notifier->v4l2_dev = NULL;
-
-       /*
-        * Don't care about the waiting list, it is initialised and populated
-        * upon notifier registration.
-        */
 }
 EXPORT_SYMBOL(v4l2_async_notifier_unregister);