diff options
author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2013-07-19 11:31:10 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-07-30 14:53:11 -0400 |
commit | e8419d0890efaccb93f9f274d9ba0aae91210e8c (patch) | |
tree | 1a1e3d3a08a3352c0d83e8d5c02fc1ec472e5360 | |
parent | e7359f8e660882fb2168609638163561eb2f50f0 (diff) |
[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>
-rw-r--r-- | drivers/media/platform/davinci/vpif_capture.c | 2 | ||||
-rw-r--r-- | drivers/media/platform/davinci/vpif_display.c | 2 | ||||
-rw-r--r-- | drivers/media/platform/soc_camera/soc_camera.c | 2 | ||||
-rw-r--r-- | drivers/media/v4l2-core/v4l2-async.c | 2 | ||||
-rw-r--r-- | include/media/v4l2-async.h | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c index b11d7a74497e..7fbde6d790b5 100644 --- 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) | |||
2168 | } | 2168 | } |
2169 | vpif_probe_complete(); | 2169 | vpif_probe_complete(); |
2170 | } else { | 2170 | } else { |
2171 | vpif_obj.notifier.subdev = vpif_obj.config->asd; | 2171 | vpif_obj.notifier.subdevs = vpif_obj.config->asd; |
2172 | vpif_obj.notifier.num_subdevs = vpif_obj.config->asd_sizes[0]; | 2172 | vpif_obj.notifier.num_subdevs = vpif_obj.config->asd_sizes[0]; |
2173 | vpif_obj.notifier.bound = vpif_async_bound; | 2173 | vpif_obj.notifier.bound = vpif_async_bound; |
2174 | vpif_obj.notifier.complete = vpif_async_complete; | 2174 | 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 c2ff06745fdc..6336dfc86482 100644 --- 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) | |||
1832 | } | 1832 | } |
1833 | vpif_probe_complete(); | 1833 | vpif_probe_complete(); |
1834 | } else { | 1834 | } else { |
1835 | vpif_obj.notifier.subdev = vpif_obj.config->asd; | 1835 | vpif_obj.notifier.subdevs = vpif_obj.config->asd; |
1836 | vpif_obj.notifier.num_subdevs = vpif_obj.config->asd_sizes[0]; | 1836 | vpif_obj.notifier.num_subdevs = vpif_obj.config->asd_sizes[0]; |
1837 | vpif_obj.notifier.bound = vpif_async_bound; | 1837 | vpif_obj.notifier.bound = vpif_async_bound; |
1838 | vpif_obj.notifier.complete = vpif_async_complete; | 1838 | 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 8af572bcf03a..4b42572253e0 100644 --- 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, | |||
1501 | return -ENOMEM; | 1501 | return -ENOMEM; |
1502 | } | 1502 | } |
1503 | 1503 | ||
1504 | sasc->notifier.subdev = asd; | 1504 | sasc->notifier.subdevs = asd; |
1505 | sasc->notifier.num_subdevs = size; | 1505 | sasc->notifier.num_subdevs = size; |
1506 | sasc->notifier.bound = soc_camera_async_bound; | 1506 | sasc->notifier.bound = soc_camera_async_bound; |
1507 | sasc->notifier.unbind = soc_camera_async_unbind; | 1507 | 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 9f91013a600d..ed31a655b9b7 100644 --- 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, | |||
147 | INIT_LIST_HEAD(¬ifier->done); | 147 | INIT_LIST_HEAD(¬ifier->done); |
148 | 148 | ||
149 | for (i = 0; i < notifier->num_subdevs; i++) { | 149 | for (i = 0; i < notifier->num_subdevs; i++) { |
150 | asd = notifier->subdev[i]; | 150 | asd = notifier->subdevs[i]; |
151 | 151 | ||
152 | switch (asd->match_type) { | 152 | switch (asd->match_type) { |
153 | case V4L2_ASYNC_MATCH_CUSTOM: | 153 | case V4L2_ASYNC_MATCH_CUSTOM: |
diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h index 82b29813f8be..8fac8eaca51a 100644 --- a/include/media/v4l2-async.h +++ b/include/media/v4l2-async.h | |||
@@ -77,7 +77,7 @@ struct v4l2_async_subdev_list { | |||
77 | /** | 77 | /** |
78 | * v4l2_async_notifier - v4l2_device notifier data | 78 | * v4l2_async_notifier - v4l2_device notifier data |
79 | * @num_subdevs:number of subdevices | 79 | * @num_subdevs:number of subdevices |
80 | * @subdev: array of pointers to subdevice descriptors | 80 | * @subdevs: array of pointers to subdevice descriptors |
81 | * @v4l2_dev: pointer to struct v4l2_device | 81 | * @v4l2_dev: pointer to struct v4l2_device |
82 | * @waiting: list of struct v4l2_async_subdev, waiting for their drivers | 82 | * @waiting: list of struct v4l2_async_subdev, waiting for their drivers |
83 | * @done: list of struct v4l2_async_subdev_list, already probed | 83 | * @done: list of struct v4l2_async_subdev_list, already probed |
@@ -88,7 +88,7 @@ struct v4l2_async_subdev_list { | |||
88 | */ | 88 | */ |
89 | struct v4l2_async_notifier { | 89 | struct v4l2_async_notifier { |
90 | unsigned int num_subdevs; | 90 | unsigned int num_subdevs; |
91 | struct v4l2_async_subdev **subdev; | 91 | struct v4l2_async_subdev **subdevs; |
92 | struct v4l2_device *v4l2_dev; | 92 | struct v4l2_device *v4l2_dev; |
93 | struct list_head waiting; | 93 | struct list_head waiting; |
94 | struct list_head done; | 94 | struct list_head done; |