V4L/DVB (9049): convert tuner drivers to use dvb_frontend->callback

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

8 files changed, 32 insertions, 39 deletions

diff --git a/drivers/media/common/tuners/tda827x.c b/drivers/media/common/tuners/tda827x.c
index 8555d9cf9051..4a74f65e759a 100644
--- a/drivers/media/common/tuners/tda827x.c
+++ b/drivers/media/common/tuners/tda827x.c
@@ -447,17 +447,19 @@ static void tda827xa_lna_gain(struct dvb_frontend *fe, int high,
                         else
                                 arg = 0;
                 }
-                if (priv->cfg->tuner_callback)
-                        priv->cfg->tuner_callback(priv->i2c_adap->algo_data,
-                                                                gp_func, arg);
+                if (fe->callback)
+                        fe->callback(priv->i2c_adap->algo_data,
+                                     DVB_FRONTEND_COMPONENT_TUNER,
+                                     gp_func, arg);
                 buf[1] = high ? 0 : 1;
                 if (priv->cfg->config == 2)
                         buf[1] = high ? 1 : 0;
                 i2c_transfer(priv->i2c_adap, &msg, 1);
                 break;
         case 3: /* switch with GPIO of saa713x */
-                if (priv->cfg->tuner_callback)
-                        priv->cfg->tuner_callback(priv->i2c_adap->algo_data, 0, high);
+                if (fe->callback)
+                        fe->callback(priv->i2c_adap->algo_data,
+                                     DVB_FRONTEND_COMPONENT_TUNER, 0, high);
                 break;
         }
 }
diff --git a/drivers/media/common/tuners/tda827x.h b/drivers/media/common/tuners/tda827x.h
index 7850a9a1dc8f..7d72ce0a0c2d 100644
--- a/drivers/media/common/tuners/tda827x.h
+++ b/drivers/media/common/tuners/tda827x.h
@@ -36,7 +36,6 @@ struct tda827x_config
         /* interface to tda829x driver */
         unsigned int config;
         int          switch_addr;
-        int (*tuner_callback) (void *dev, int command, int arg);
 
         void (*agcf)(struct dvb_frontend *fe);
 };
diff --git a/drivers/media/common/tuners/tda8290.c b/drivers/media/common/tuners/tda8290.c
index 91204d3f282d..c112bdd4e0f0 100644
--- a/drivers/media/common/tuners/tda8290.c
+++ b/drivers/media/common/tuners/tda8290.c
@@ -672,10 +672,8 @@ struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe,
         priv->i2c_props.addr     = i2c_addr;
         priv->i2c_props.adap     = i2c_adap;
         priv->i2c_props.name     = "tda829x";
-        if (cfg) {
+        if (cfg)
                 priv->cfg.config         = cfg->lna_cfg;
-                priv->cfg.tuner_callback = cfg->tuner_callback;
-        }
 
         if (tda8290_probe(&priv->i2c_props) == 0) {
                 priv->ver = TDA8290;
diff --git a/drivers/media/common/tuners/tda8290.h b/drivers/media/common/tuners/tda8290.h
index aa074f3f0c07..7e288b26fcc3 100644
--- a/drivers/media/common/tuners/tda8290.h
+++ b/drivers/media/common/tuners/tda8290.h
@@ -22,7 +22,6 @@
 
 struct tda829x_config {
         unsigned int lna_cfg;
-        int (*tuner_callback) (void *dev, int command, int arg);
 
         unsigned int probe_tuner:1;
 #define TDA829X_PROBE_TUNER 0
diff --git a/drivers/media/common/tuners/tuner-xc2028.c b/drivers/media/common/tuners/tuner-xc2028.c
index 4dd1d2421cc5..fc82d154c8c2 100644
--- a/drivers/media/common/tuners/tuner-xc2028.c
+++ b/drivers/media/common/tuners/tuner-xc2028.c
@@ -71,9 +71,6 @@ struct firmware_properties {
 struct xc2028_data {
         struct list_head        hybrid_tuner_instance_list;
         struct tuner_i2c_props  i2c_props;
-        int                     (*tuner_callback) (void *dev,
-                                                   int command, int arg);
-        void                    *video_dev;
         __u32                   frequency;
 
         struct firmware_description *firm;
@@ -492,6 +489,23 @@ ret:
         return i;
 }
 
+static inline int do_tuner_callback(struct dvb_frontend *fe, int cmd, int arg)
+{
+        struct xc2028_data *priv = fe->tuner_priv;
+
+        /* analog side (tuner-core) uses i2c_adap->algo_data.
+         * digital side is not guaranteed to have algo_data defined.
+         *
+         * digital side will always have fe->dvb defined.
+         * analog side (tuner-core) doesn't (yet) define fe->dvb.
+         */
+
+        return (!fe->callback) ? -EINVAL :
+                fe->callback(((fe->dvb) && (fe->dvb->priv)) ?
+                                fe->dvb->priv : priv->i2c_props.adap->algo_data,
+                             DVB_FRONTEND_COMPONENT_TUNER, cmd, arg);
+}
+
 static int load_firmware(struct dvb_frontend *fe, unsigned int type,
                          v4l2_std_id *id)
 {
@@ -530,8 +544,7 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,
 
                 if (!size) {
                         /* Special callback command received */
-                        rc = priv->tuner_callback(priv->video_dev,
-                                                  XC2028_TUNER_RESET, 0);
+                        rc = do_tuner_callback(fe, XC2028_TUNER_RESET, 0);
                         if (rc < 0) {
                                 tuner_err("Error at RESET code %d\n",
                                            (*p) & 0x7f);
@@ -542,8 +555,7 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,
                 if (size >= 0xff00) {
                         switch (size) {
                         case 0xff00:
-                                rc = priv->tuner_callback(priv->video_dev,
-                                                        XC2028_RESET_CLK, 0);
+                                rc = do_tuner_callback(fe, XC2028_RESET_CLK, 0);
                                 if (rc < 0) {
                                         tuner_err("Error at RESET code %d\n",
                                                   (*p) & 0x7f);
@@ -715,8 +727,7 @@ retry:
         memset(&priv->cur_fw, 0, sizeof(priv->cur_fw));
 
         /* Reset is needed before loading firmware */
-        rc = priv->tuner_callback(priv->video_dev,
-                                  XC2028_TUNER_RESET, 0);
+        rc = do_tuner_callback(fe, XC2028_TUNER_RESET, 0);
         if (rc < 0)
                 goto fail;
 
@@ -933,7 +944,7 @@ static int generic_set_freq(struct dvb_frontend *fe, u32 freq /* in HZ */,
            The reset CLK is needed only with tm6000.
            Driver should work fine even if this fails.
          */
-        priv->tuner_callback(priv->video_dev, XC2028_RESET_CLK, 1);
+        do_tuner_callback(fe, XC2028_RESET_CLK, 1);
 
         msleep(10);
 
@@ -1177,20 +1188,10 @@ struct dvb_frontend *xc2028_attach(struct dvb_frontend *fe,
                 break;
         case 1:
                 /* new tuner instance */
-                priv->tuner_callback = cfg->callback;
                 priv->ctrl.max_len = 13;
 
                 mutex_init(&priv->lock);
 
-                /* analog side (tuner-core) uses i2c_adap->algo_data.
-                 * digital side is not guaranteed to have algo_data defined.
-                 *
-                 * digital side will always have fe->dvb defined.
-                 * analog side (tuner-core) doesn't (yet) define fe->dvb.
-                 */
-                priv->video_dev = ((fe->dvb) && (fe->dvb->priv)) ?
-                                   fe->dvb->priv : cfg->i2c_adap->algo_data;
-
                 fe->tuner_priv = priv;
                 break;
         case 2:
diff --git a/drivers/media/common/tuners/tuner-xc2028.h b/drivers/media/common/tuners/tuner-xc2028.h
index 2c5b6282b569..1af69f49f8e1 100644
--- a/drivers/media/common/tuners/tuner-xc2028.h
+++ b/drivers/media/common/tuners/tuner-xc2028.h
@@ -39,9 +39,7 @@ struct xc2028_ctrl {
 struct xc2028_config {
         struct i2c_adapter *i2c_adap;
         u8                 i2c_addr;
-        void               *video_dev;
         struct xc2028_ctrl *ctrl;
-        int                (*callback) (void *dev, int command, int arg);
 };
 
 /* xc2028 commands for callback */
diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c
index ccc4dae4126a..f9c2bb917f54 100644
--- a/drivers/media/common/tuners/xc5000.c
+++ b/drivers/media/common/tuners/xc5000.c
@@ -58,8 +58,6 @@ struct xc5000_priv {
         u32 bandwidth;
         u8  video_standard;
         u8  rf_mode;
-
-        int  (*tuner_callback) (void *priv, int command, int arg);
 };
 
 /* Misc Defines */
@@ -232,10 +230,11 @@ static void xc5000_TunerReset(struct dvb_frontend *fe)
 
         dprintk(1, "%s()\n", __func__);
 
-        if (priv->tuner_callback) {
-                ret = priv->tuner_callback(((fe->dvb) && (fe->dvb->priv)) ?
+        if (fe->callback) {
+                ret = fe->callback(((fe->dvb) && (fe->dvb->priv)) ?
                                            fe->dvb->priv :
                                            priv->i2c_props.adap->algo_data,
+                                           DVB_FRONTEND_COMPONENT_TUNER,
                                            XC5000_TUNER_RESET, 0);
                 if (ret)
                         printk(KERN_ERR "xc5000: reset failed\n");
@@ -975,7 +974,6 @@ struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe,
                 /* new tuner instance */
                 priv->bandwidth = BANDWIDTH_6_MHZ;
                 priv->if_khz = cfg->if_khz;
-                priv->tuner_callback = cfg->tuner_callback;
 
                 fe->tuner_priv = priv;
                 break;
diff --git a/drivers/media/common/tuners/xc5000.h b/drivers/media/common/tuners/xc5000.h
index fa0321cfd179..cf1a558e0e7f 100644
--- a/drivers/media/common/tuners/xc5000.h
+++ b/drivers/media/common/tuners/xc5000.h
@@ -30,8 +30,6 @@ struct i2c_adapter;
 struct xc5000_config {
         u8   i2c_address;
         u32  if_khz;
-
-        int  (*tuner_callback) (void *priv, int command, int arg);
 };
 
 /* xc5000 callback command */