diff options
author | Mike Isely <isely@pobox.com> | 2007-01-19 22:09:47 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-21 10:34:38 -0500 |
commit | 18103c57b0168ebc0401702d483fe131f0aecc7a (patch) | |
tree | 1d57e73217254121f0c023009c510a4936332d64 /drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | |
parent | af78a48b69231e129db0e1db24053da22f8eed6d (diff) |
V4L/DVB (5081): Pvrusb2: VIDIOC_G_TUNER cleanup
Clean up use of VIDIOC_G_TUNER; we now correctly gather info from all
the I2C client modules. Also abide by V4L2_TUNER_CAP_LOW
appropriately.
Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c index c2a154e4ec59..a3357bf2a1af 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c +++ b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | |||
@@ -199,18 +199,6 @@ static int decoder_detect(struct pvr2_i2c_client *cp) | |||
199 | } | 199 | } |
200 | 200 | ||
201 | 201 | ||
202 | static int decoder_is_tuned(struct pvr2_v4l_cx2584x *ctxt) | ||
203 | { | ||
204 | struct v4l2_tuner vt; | ||
205 | int ret; | ||
206 | |||
207 | memset(&vt,0,sizeof(vt)); | ||
208 | ret = pvr2_i2c_client_cmd(ctxt->client,VIDIOC_G_TUNER,&vt); | ||
209 | if (ret < 0) return -EINVAL; | ||
210 | return vt.signal ? 1 : 0; | ||
211 | } | ||
212 | |||
213 | |||
214 | static unsigned int decoder_describe(struct pvr2_v4l_cx2584x *ctxt, | 202 | static unsigned int decoder_describe(struct pvr2_v4l_cx2584x *ctxt, |
215 | char *buf,unsigned int cnt) | 203 | char *buf,unsigned int cnt) |
216 | { | 204 | { |
@@ -252,7 +240,6 @@ int pvr2_i2c_cx2584x_v4l_setup(struct pvr2_hdw *hdw, | |||
252 | ctxt->ctrl.ctxt = ctxt; | 240 | ctxt->ctrl.ctxt = ctxt; |
253 | ctxt->ctrl.detach = (void (*)(void *))decoder_detach; | 241 | ctxt->ctrl.detach = (void (*)(void *))decoder_detach; |
254 | ctxt->ctrl.enable = (void (*)(void *,int))decoder_enable; | 242 | ctxt->ctrl.enable = (void (*)(void *,int))decoder_enable; |
255 | ctxt->ctrl.tuned = (int (*)(void *))decoder_is_tuned; | ||
256 | ctxt->ctrl.force_reset = (void (*)(void*))decoder_reset; | 243 | ctxt->ctrl.force_reset = (void (*)(void*))decoder_reset; |
257 | ctxt->client = cp; | 244 | ctxt->client = cp; |
258 | ctxt->hdw = hdw; | 245 | ctxt->hdw = hdw; |