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>

1 files changed, 0 insertions, 24 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-audio.c b/drivers/media/video/pvrusb2/pvrusb2-audio.c
index 122496f36845..5d30c9366144 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-audio.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-audio.c
@@ -31,7 +31,6 @@ struct pvr2_msp3400_handler {
         struct pvr2_hdw *hdw;
         struct pvr2_i2c_client *client;
         struct pvr2_i2c_handler i2c_handler;
-        struct pvr2_audio_stat astat;
         unsigned long stale_mask;
 };
 
@@ -126,27 +125,9 @@ static void msp3400_update(struct pvr2_msp3400_handler *ctxt)
 }
 
 
-/* This reads back the current signal type */
-static int get_audio_status(struct pvr2_msp3400_handler *ctxt)
-{
-        struct v4l2_tuner vt;
-        int stat;
-
-        memset(&vt,0,sizeof(vt));
-        stat = pvr2_i2c_client_cmd(ctxt->client,VIDIOC_G_TUNER,&vt);
-        if (stat < 0) return stat;
-
-        ctxt->hdw->flag_stereo = (vt.audmode & V4L2_TUNER_MODE_STEREO) != 0;
-        ctxt->hdw->flag_bilingual =
-                (vt.audmode & V4L2_TUNER_MODE_LANG2) != 0;
-        return 0;
-}
-
-
 static void pvr2_msp3400_detach(struct pvr2_msp3400_handler *ctxt)
 {
         ctxt->client->handler = NULL;
-        ctxt->hdw->audio_stat = NULL;
         kfree(ctxt);
 }
 
@@ -169,7 +150,6 @@ static const struct pvr2_i2c_handler_functions msp3400_funcs = {
 int pvr2_i2c_msp3400_setup(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
 {
         struct pvr2_msp3400_handler *ctxt;
-        if (hdw->audio_stat) return 0;
         if (cp->handler) return 0;
 
         ctxt = kmalloc(sizeof(*ctxt),GFP_KERNEL);
@@ -180,13 +160,9 @@ int pvr2_i2c_msp3400_setup(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
         ctxt->i2c_handler.func_table = &msp3400_funcs;
         ctxt->client = cp;
         ctxt->hdw = hdw;
-        ctxt->astat.ctxt = ctxt;
-        ctxt->astat.status = (int (*)(void *))get_audio_status;
-        ctxt->astat.detach = (void (*)(void *))pvr2_msp3400_detach;
         ctxt->stale_mask = (1 << (sizeof(msp3400_ops)/
                                   sizeof(msp3400_ops[0]))) - 1;
         cp->handler = &ctxt->i2c_handler;
-        hdw->audio_stat = &ctxt->astat;
         pvr2_trace(PVR2_TRACE_CHIPS,"i2c 0x%x msp3400 V4L2 handler set up",
                    cp->client->addr);
         return !0;