[media] V4L: Rename subdev field of struct v4l2_async_notifier

This is a purely cosmetic change. Since the 'subdev' member
points to an array of subdevs make it more explicit by
renaming to the plural form.
Acked-and-tested-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index b11d7a74497e14ee9bf35233f142073fe2b0c2d4..7fbde6d790b5fb1e2173cbebd385ff060e74e553 100644 (file)
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -2168,7 +2168,7 @@ static __init int vpif_probe(struct platform_device *pdev)
                }
                vpif_probe_complete();
        } else {
-               vpif_obj.notifier.subdev = vpif_obj.config->asd;
+               vpif_obj.notifier.subdevs = vpif_obj.config->asd;
                vpif_obj.notifier.num_subdevs = vpif_obj.config->asd_sizes[0];
                vpif_obj.notifier.bound = vpif_async_bound;
                vpif_obj.notifier.complete = vpif_async_complete;

diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index c2ff06745fdc05ea207a23a2ea0f7f573eb6814d..6336dfc864822024e13800c81062f5c2b0af24ba 100644 (file)
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -1832,7 +1832,7 @@ static __init int vpif_probe(struct platform_device *pdev)
                }
                vpif_probe_complete();
        } else {
-               vpif_obj.notifier.subdev = vpif_obj.config->asd;
+               vpif_obj.notifier.subdevs = vpif_obj.config->asd;
                vpif_obj.notifier.num_subdevs = vpif_obj.config->asd_sizes[0];
                vpif_obj.notifier.bound = vpif_async_bound;
                vpif_obj.notifier.complete = vpif_async_complete;

diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
index 8af572bcf03a6ff2df30a25a1f0cee93ecf0ab4c..4b42572253e0fad7be92239e9f6a1582e068b2fb 100644 (file)
--- a/drivers/media/platform/soc_camera/soc_camera.c
+++ b/drivers/media/platform/soc_camera/soc_camera.c
@@ -1501,7 +1501,7 @@ static int scan_async_group(struct soc_camera_host *ici,
                return -ENOMEM;
        }
 
-       sasc->notifier.subdev = asd;
+       sasc->notifier.subdevs = asd;
        sasc->notifier.num_subdevs = size;
        sasc->notifier.bound = soc_camera_async_bound;
        sasc->notifier.unbind = soc_camera_async_unbind;

diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
index 9f91013a600d516aca48a6f7410ea8a73d2c910a..ed31a655b9b7e54ea5668b5d7f5c14c3f0bf18da 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-async.c
+++ b/drivers/media/v4l2-core/v4l2-async.c
@@ -147,7 +147,7 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
        INIT_LIST_HEAD(&notifier->done);
 
        for (i = 0; i < notifier->num_subdevs; i++) {
-               asd = notifier->subdev[i];
+               asd = notifier->subdevs[i];
 
                switch (asd->match_type) {
                case V4L2_ASYNC_MATCH_CUSTOM:

diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
index 82b29813f8bed989acb24e377f7d5cfca313a251..8fac8eaca51ad95d0d2513c1de5ae29dba7e00b1 100644 (file)
--- a/include/media/v4l2-async.h
+++ b/include/media/v4l2-async.h
@@ -77,7 +77,7 @@ struct v4l2_async_subdev_list {
 /**
  * v4l2_async_notifier - v4l2_device notifier data
  * @num_subdevs:number of subdevices
- * @subdev:    array of pointers to subdevice descriptors
+ * @subdevs:   array of pointers to subdevice descriptors
  * @v4l2_dev:  pointer to struct v4l2_device
  * @waiting:   list of struct v4l2_async_subdev, waiting for their drivers
  * @done:      list of struct v4l2_async_subdev_list, already probed
@@ -88,7 +88,7 @@ struct v4l2_async_subdev_list {
  */
 struct v4l2_async_notifier {
        unsigned int num_subdevs;
-       struct v4l2_async_subdev **subdev;
+       struct v4l2_async_subdev **subdevs;
        struct v4l2_device *v4l2_dev;
        struct list_head waiting;
        struct list_head done;