* [PATCH] s3c-camif: Remove use of deprecated V4L2_CTRL_FLAG_DISABLED.
@ 2014-01-20 9:27 Hans Verkuil
2014-01-20 9:48 ` Sylwester Nawrocki
0 siblings, 1 reply; 2+ messages in thread
From: Hans Verkuil @ 2014-01-20 9:27 UTC (permalink / raw)
To: Sachin Kamat, Sylwester Nawrocki; +Cc: Linux Media Mailing List
I came across this while checking the kernel use of V4L2_CTRL_FLAG_DISABLED.
This flag should not be used with the control framework. Instead, just don't
add the control at all.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
drivers/media/platform/s3c-camif/camif-capture.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/media/platform/s3c-camif/camif-capture.c b/drivers/media/platform/s3c-camif/camif-capture.c
index 40b298a..5372111 100644
--- a/drivers/media/platform/s3c-camif/camif-capture.c
+++ b/drivers/media/platform/s3c-camif/camif-capture.c
@@ -1592,26 +1592,27 @@ int s3c_camif_create_subdev(struct camif_dev *camif)
ARRAY_SIZE(s3c_camif_test_pattern_menu) - 1, 0, 0,
s3c_camif_test_pattern_menu);
- camif->ctrl_colorfx = v4l2_ctrl_new_std_menu(handler,
+ if (camif->variant->has_img_effect) {
+ camif->ctrl_colorfx = v4l2_ctrl_new_std_menu(handler,
&s3c_camif_subdev_ctrl_ops,
V4L2_CID_COLORFX, V4L2_COLORFX_SET_CBCR,
~0x981f, V4L2_COLORFX_NONE);
- camif->ctrl_colorfx_cbcr = v4l2_ctrl_new_std(handler,
+ camif->ctrl_colorfx_cbcr = v4l2_ctrl_new_std(handler,
&s3c_camif_subdev_ctrl_ops,
V4L2_CID_COLORFX_CBCR, 0, 0xffff, 1, 0);
+ }
+
if (handler->error) {
v4l2_ctrl_handler_free(handler);
media_entity_cleanup(&sd->entity);
return handler->error;
}
- v4l2_ctrl_auto_cluster(2, &camif->ctrl_colorfx,
+ if (camif->variant->has_img_effect)
+ v4l2_ctrl_auto_cluster(2, &camif->ctrl_colorfx,
V4L2_COLORFX_SET_CBCR, false);
- if (!camif->variant->has_img_effect) {
- camif->ctrl_colorfx->flags |= V4L2_CTRL_FLAG_DISABLED;
- camif->ctrl_colorfx_cbcr->flags |= V4L2_CTRL_FLAG_DISABLED;
- }
+
sd->ctrl_handler = handler;
v4l2_set_subdevdata(sd, camif);
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] s3c-camif: Remove use of deprecated V4L2_CTRL_FLAG_DISABLED.
2014-01-20 9:27 [PATCH] s3c-camif: Remove use of deprecated V4L2_CTRL_FLAG_DISABLED Hans Verkuil
@ 2014-01-20 9:48 ` Sylwester Nawrocki
0 siblings, 0 replies; 2+ messages in thread
From: Sylwester Nawrocki @ 2014-01-20 9:48 UTC (permalink / raw)
To: Hans Verkuil; +Cc: Sachin Kamat, Linux Media Mailing List
On 20/01/14 10:27, Hans Verkuil wrote:
> I came across this while checking the kernel use of V4L2_CTRL_FLAG_DISABLED.
>
> This flag should not be used with the control framework. Instead, just don't
> add the control at all.
>
> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-01-20 9:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-20 9:27 [PATCH] s3c-camif: Remove use of deprecated V4L2_CTRL_FLAG_DISABLED Hans Verkuil
2014-01-20 9:48 ` Sylwester Nawrocki
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.