V4L/DVB: cx25840/ivtv: replace ugly priv control with s_config

The cx25840 used a private control CX25840_CID_ENABLE_PVR150_WORKAROUND
to be told whether to enable a workaround for certain pvr150 cards.

This is really config data that it needs to get at load time.

Implemented this in cx25840 and ivtv.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 1 insertions, 8 deletions

diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index 07c5c18a25cb..f72e9d1cee09 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -1269,15 +1269,8 @@ int ivtv_init_on_first_open(struct ivtv *itv)
         IVTV_DEBUG_INFO("Getting firmware version..\n");
         ivtv_firmware_versions(itv);
 
-        if (itv->card->hw_all & IVTV_HW_CX25840) {
-                struct v4l2_control ctrl;
-
+        if (itv->card->hw_all & IVTV_HW_CX25840)
                 v4l2_subdev_call(itv->sd_video, core, load_fw);
-                /* CX25840_CID_ENABLE_PVR150_WORKAROUND */
-                ctrl.id = V4L2_CID_PRIVATE_BASE;
-                ctrl.value = itv->pvr150_workaround;
-                v4l2_subdev_call(itv->sd_video, core, s_ctrl, &ctrl);
-        }
 
         vf.tuner = 0;
         vf.type = V4L2_TUNER_ANALOG_TV;