V4L/DVB (7127): tuner: remove dependency of tuner-core on tuner-types

This patch fully removes the dependency of tuner-core on
tuner-types.

There is no longer any need to pass struct tunertype in attach-time
config structure - instead pass the tuner type ID.

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

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/media/video/tuner-simple.c b/drivers/media/video/tuner-simple.c
index d3362703e25..de0b291459f 100644
--- a/drivers/media/video/tuner-simple.c
+++ b/drivers/media/video/tuner-simple.c
@@ -684,7 +684,7 @@ static struct dvb_tuner_ops simple_tuner_ops = {
 struct dvb_frontend *simple_tuner_attach(struct dvb_frontend *fe,
                                          struct i2c_adapter *i2c_adap,
                                          u8 i2c_addr,
-                                         struct simple_tuner_config *cfg)
+                                         unsigned int type)
 {
         struct tuner_simple_priv *priv = NULL;
 
@@ -701,15 +701,15 @@ struct dvb_frontend *simple_tuner_attach(struct dvb_frontend *fe,
 
         priv->i2c_props.addr = i2c_addr;
         priv->i2c_props.adap = i2c_adap;
-        priv->type = cfg->type;
-        priv->tun  = cfg->tun;
+        priv->type = type;
+        priv->tun  = &tuners[type];
 
         memcpy(&fe->ops.tuner_ops, &simple_tuner_ops,
                sizeof(struct dvb_tuner_ops));
 
-        tuner_info("type set to %d (%s)\n", cfg->type, cfg->tun->name);
+        tuner_info("type set to %d (%s)\n", priv->type, priv->tun->name);
 
-        strlcpy(fe->ops.tuner_ops.info.name, cfg->tun->name,
+        strlcpy(fe->ops.tuner_ops.info.name, priv->tun->name,
                 sizeof(fe->ops.tuner_ops.info.name));
 
         return fe;