V4L/DVB (6384): Replace TDA9887_SET_CONFIG by TUNER_SET_CONFIG

Currently, the only tuner-specific device that allows special
configurations is tda9887. However, tea5767 also may require some
special configurations (for example, to specify a different Xtal freq).

This patch replaces TDA9887_SET_CONFIG by a more generic internal ioctl
(TUNER_SET_CONFIG). The newer one allows specifying what tuner is
appliable to a configuration set, and allows an arbitrary configuration
struct.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 10 insertions, 3 deletions

diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index 6deaad1a548..800b397f8f1 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -323,7 +323,6 @@ static int attach_inform(struct i2c_client *client)
 {
         struct saa7134_dev *dev = client->adapter->algo_data;
         int tuner = dev->tuner_type;
-        int conf  = dev->tda9887_conf;
         struct tuner_setup tun_setup;
 
         d1printk( "%s i2c attach [addr=0x%x,client=%s]\n",
@@ -360,7 +359,6 @@ static int attach_inform(struct i2c_client *client)
         }
 
         if (tuner != UNSET) {
-
                 tun_setup.type = tuner;
                 tun_setup.addr = saa7134_boards[dev->board].tuner_addr;
                 tun_setup.config = saa7134_boards[dev->board].tuner_config;
@@ -372,9 +370,18 @@ static int attach_inform(struct i2c_client *client)
 
                         client->driver->command(client,TUNER_SET_TYPE_ADDR, &tun_setup);
                 }
+
+                if (tuner == TUNER_TDA9887) {
+                        struct v4l2_priv_tun_config tda9887_cfg;
+
+                        tda9887_cfg.tuner = TUNER_TDA9887;
+                        tda9887_cfg.priv = &dev->tda9887_conf;
+
+                        client->driver->command(client, TUNER_SET_CONFIG,
+                                                &tda9887_cfg);
+                }
         }
 
-        client->driver->command(client, TDA9887_SET_CONFIG, &conf);
 
         return 0;
 }