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-video-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-video-v4l.c')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-video-v4l.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c index 2a826464911a..8b37748cfcba 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c +++ b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c | |||
@@ -183,18 +183,6 @@ static void decoder_enable(struct pvr2_v4l_decoder *ctxt,int fl) | |||
183 | } | 183 | } |
184 | 184 | ||
185 | 185 | ||
186 | static int decoder_is_tuned(struct pvr2_v4l_decoder *ctxt) | ||
187 | { | ||
188 | struct v4l2_tuner vt; | ||
189 | int ret; | ||
190 | |||
191 | memset(&vt,0,sizeof(vt)); | ||
192 | ret = pvr2_i2c_client_cmd(ctxt->client,VIDIOC_G_TUNER,&vt); | ||
193 | if (ret < 0) return -EINVAL; | ||
194 | return vt.signal ? 1 : 0; | ||
195 | } | ||
196 | |||
197 | |||
198 | static unsigned int decoder_describe(struct pvr2_v4l_decoder *ctxt,char *buf,unsigned int cnt) | 186 | static unsigned int decoder_describe(struct pvr2_v4l_decoder *ctxt,char *buf,unsigned int cnt) |
199 | { | 187 | { |
200 | return scnprintf(buf,cnt,"handler: pvrusb2-video-v4l"); | 188 | return scnprintf(buf,cnt,"handler: pvrusb2-video-v4l"); |
@@ -227,7 +215,6 @@ int pvr2_i2c_decoder_v4l_setup(struct pvr2_hdw *hdw, | |||
227 | ctxt->ctrl.ctxt = ctxt; | 215 | ctxt->ctrl.ctxt = ctxt; |
228 | ctxt->ctrl.detach = (void (*)(void *))decoder_detach; | 216 | ctxt->ctrl.detach = (void (*)(void *))decoder_detach; |
229 | ctxt->ctrl.enable = (void (*)(void *,int))decoder_enable; | 217 | ctxt->ctrl.enable = (void (*)(void *,int))decoder_enable; |
230 | ctxt->ctrl.tuned = (int (*)(void *))decoder_is_tuned; | ||
231 | ctxt->client = cp; | 218 | ctxt->client = cp; |
232 | ctxt->hdw = hdw; | 219 | ctxt->hdw = hdw; |
233 | ctxt->stale_mask = (1 << (sizeof(decoder_ops)/ | 220 | ctxt->stale_mask = (1 << (sizeof(decoder_ops)/ |