From: Hans Verkuil Date: Fri, 2 Mar 2012 16:02:11 +0000 (-0300) Subject: [media] ivtv: simplify how the decoder controls are set up X-Git-Tag: MMI-PSA29.97-13-9~14196^2~2653 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=eb2ba855470797b20dced364f5897cc949e7ade6;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git [media] ivtv: simplify how the decoder controls are set up The code was unnecessarily complex, introducing a hdl_out handler that was not needed. Instead just add the controls to the cxhdl.hdl handler directly. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/ivtv/ivtv-controls.c b/drivers/media/video/ivtv/ivtv-controls.c index e2901184db09..c60424601cb9 100644 --- a/drivers/media/video/ivtv/ivtv-controls.c +++ b/drivers/media/video/ivtv/ivtv-controls.c @@ -129,7 +129,7 @@ int ivtv_g_pts_frame(struct ivtv *itv, s64 *pts, s64 *frame) static int ivtv_g_volatile_ctrl(struct v4l2_ctrl *ctrl) { - struct ivtv *itv = container_of(ctrl->handler, struct ivtv, hdl_out); + struct ivtv *itv = container_of(ctrl->handler, struct ivtv, cxhdl.hdl); switch (ctrl->id) { /* V4L2_CID_MPEG_VIDEO_DEC_PTS and V4L2_CID_MPEG_VIDEO_DEC_FRAME @@ -143,7 +143,7 @@ static int ivtv_g_volatile_ctrl(struct v4l2_ctrl *ctrl) static int ivtv_s_ctrl(struct v4l2_ctrl *ctrl) { - struct ivtv *itv = container_of(ctrl->handler, struct ivtv, hdl_out); + struct ivtv *itv = container_of(ctrl->handler, struct ivtv, cxhdl.hdl); switch (ctrl->id) { /* V4L2_CID_MPEG_AUDIO_DEC_PLAYBACK and MULTILINGUAL_PLAYBACK diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c index 107e9e6d6a52..cfc4276d907e 100644 --- a/drivers/media/video/ivtv/ivtv-driver.c +++ b/drivers/media/video/ivtv/ivtv-driver.c @@ -1198,28 +1198,28 @@ static int __devinit ivtv_probe(struct pci_dev *pdev, itv->tuner_std = itv->std; if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) { - v4l2_ctrl_handler_init(&itv->hdl_out, 50); - itv->ctrl_pts = v4l2_ctrl_new_std(&itv->hdl_out, &ivtv_hdl_out_ops, + struct v4l2_ctrl_handler *hdl = itv->v4l2_dev.ctrl_handler; + + itv->ctrl_pts = v4l2_ctrl_new_std(hdl, &ivtv_hdl_out_ops, V4L2_CID_MPEG_VIDEO_DEC_PTS, 0, 0, 1, 0); - itv->ctrl_frame = v4l2_ctrl_new_std(&itv->hdl_out, &ivtv_hdl_out_ops, + itv->ctrl_frame = v4l2_ctrl_new_std(hdl, &ivtv_hdl_out_ops, V4L2_CID_MPEG_VIDEO_DEC_FRAME, 0, 0x7fffffff, 1, 0); /* Note: V4L2_MPEG_AUDIO_DEC_PLAYBACK_AUTO is not supported, mask that menu item. */ itv->ctrl_audio_playback = - v4l2_ctrl_new_std_menu(&itv->hdl_out, &ivtv_hdl_out_ops, + v4l2_ctrl_new_std_menu(hdl, &ivtv_hdl_out_ops, V4L2_CID_MPEG_AUDIO_DEC_PLAYBACK, V4L2_MPEG_AUDIO_DEC_PLAYBACK_SWAPPED_STEREO, 1 << V4L2_MPEG_AUDIO_DEC_PLAYBACK_AUTO, V4L2_MPEG_AUDIO_DEC_PLAYBACK_STEREO); itv->ctrl_audio_multilingual_playback = - v4l2_ctrl_new_std_menu(&itv->hdl_out, &ivtv_hdl_out_ops, + v4l2_ctrl_new_std_menu(hdl, &ivtv_hdl_out_ops, V4L2_CID_MPEG_AUDIO_DEC_MULTILINGUAL_PLAYBACK, V4L2_MPEG_AUDIO_DEC_PLAYBACK_SWAPPED_STEREO, 1 << V4L2_MPEG_AUDIO_DEC_PLAYBACK_AUTO, V4L2_MPEG_AUDIO_DEC_PLAYBACK_LEFT); - v4l2_ctrl_add_handler(&itv->hdl_out, &itv->cxhdl.hdl); - if (itv->hdl_out.error) { - retval = itv->hdl_out.error; + if (hdl->error) { + retval = hdl->error; goto free_i2c; } v4l2_ctrl_cluster(2, &itv->ctrl_pts); @@ -1260,8 +1260,6 @@ free_streams: free_irq: free_irq(itv->pdev->irq, (void *)itv); free_i2c: - if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) - v4l2_ctrl_handler_free(&itv->hdl_out); v4l2_ctrl_handler_free(&itv->cxhdl.hdl); exit_ivtv_i2c(itv); free_io: @@ -1418,8 +1416,6 @@ static void ivtv_remove(struct pci_dev *pdev) ivtv_streams_cleanup(itv, 1); ivtv_udma_free(itv); - if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) - v4l2_ctrl_handler_free(&itv->hdl_out); v4l2_ctrl_handler_free(&itv->cxhdl.hdl); exit_ivtv_i2c(itv); diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h index f83857aedbd1..f767df943954 100644 --- a/drivers/media/video/ivtv/ivtv-driver.h +++ b/drivers/media/video/ivtv/ivtv-driver.h @@ -641,7 +641,6 @@ struct ivtv { struct v4l2_ctrl *ctrl_audio_playback; struct v4l2_ctrl *ctrl_audio_multilingual_playback; }; - struct v4l2_ctrl_handler hdl_out; struct v4l2_ctrl_handler hdl_gpio; struct v4l2_subdev sd_gpio; /* GPIO sub-device */ u16 instance; diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c index 385e003fcfbb..5452beef8e11 100644 --- a/drivers/media/video/ivtv/ivtv-ioctl.c +++ b/drivers/media/video/ivtv/ivtv-ioctl.c @@ -1548,10 +1548,7 @@ static int ivtv_log_status(struct file *file, void *fh) } IVTV_INFO("Tuner: %s\n", test_bit(IVTV_F_I_RADIO_USER, &itv->i_flags) ? "Radio" : "TV"); - if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) - v4l2_ctrl_handler_log_status(&itv->hdl_out, itv->v4l2_dev.name); - else - v4l2_ctrl_handler_log_status(&itv->cxhdl.hdl, itv->v4l2_dev.name); + v4l2_ctrl_handler_log_status(&itv->cxhdl.hdl, itv->v4l2_dev.name); IVTV_INFO("Status flags: 0x%08lx\n", itv->i_flags); for (i = 0; i < IVTV_MAX_STREAMS; i++) { struct ivtv_stream *s = &itv->streams[i]; diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c index 9cc037c12609..7ea5ca7f012b 100644 --- a/drivers/media/video/ivtv/ivtv-streams.c +++ b/drivers/media/video/ivtv/ivtv-streams.c @@ -223,11 +223,8 @@ static int ivtv_prep_dev(struct ivtv *itv, int type) s->vdev->num = num; s->vdev->v4l2_dev = &itv->v4l2_dev; - if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) - s->vdev->ctrl_handler = &itv->hdl_out; - else - s->vdev->ctrl_handler = itv->v4l2_dev.ctrl_handler; s->vdev->fops = ivtv_stream_info[type].fops; + s->vdev->ctrl_handler = itv->v4l2_dev.ctrl_handler; s->vdev->release = video_device_release; s->vdev->tvnorms = V4L2_STD_ALL; s->vdev->lock = &itv->serialize_lock;